Skip to content

Commit

Permalink
Remove 64_BITS
Browse files Browse the repository at this point in the history
  • Loading branch information
angeluriot committed Sep 12, 2023
1 parent cf293a0 commit 125104e
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ target_include_directories(${PROJECT_NAME} PUBLIC libraries/Dimension3D/includes
# SFML
if(MSVC)

if(X64_BITS)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(SFML_PATH libraries/SFML/VS/x64)
else()
set(SFML_PATH libraries/SFML/VS/x86)
endif()

elseif(MINGW)

if(X64_BITS)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(SFML_PATH libraries/SFML/MinGW/x64)
else()
set(SFML_PATH libraries/SFML/MinGW/x86)
Expand Down
4 changes: 2 additions & 2 deletions libraries/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ add_link_options(-lmingw32 -lgdi32 -luser32 -lkernel32 -ladvapi32 -lshell32 -lgc
# SFML
if(MSVC)

if(X64_BITS)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(LIB_SFML_PATH SFML/VS/x64)
else()
set(LIB_SFML_PATH SFML/VS/x86)
endif()

elseif(MINGW)

if(X64_BITS)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(LIB_SFML_PATH SFML/MinGW/x64)
else()
set(LIB_SFML_PATH SFML/MinGW/x86)
Expand Down
4 changes: 0 additions & 4 deletions mingw32_launch.bat

This file was deleted.

4 changes: 0 additions & 4 deletions mingw64_launch.bat

This file was deleted.

4 changes: 4 additions & 0 deletions mingw_run.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cmake -G "MinGW Makefiles" -B "./build" .
cd build
make
cd ..
File renamed without changes.
1 change: 0 additions & 1 deletion vs32_launch.bat

This file was deleted.

1 change: 1 addition & 0 deletions vs32_run.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cmake -G "Visual Studio 16 2019" -A Win32 -B "./build" .
1 change: 0 additions & 1 deletion vs64_launch.bat

This file was deleted.

1 change: 1 addition & 0 deletions vs64_run.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cmake -G "Visual Studio 16 2019" -A x64 -B "./build" .

0 comments on commit 125104e

Please sign in to comment.