Skip to content

Commit 86d0ad1

Browse files
committed
Remove 64_BITS
1 parent 7e23e32 commit 86d0ad1

File tree

10 files changed

+10
-14
lines changed

10 files changed

+10
-14
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ target_include_directories(${PROJECT_NAME} PUBLIC libraries/Dimension3D/includes
4545
# SFML
4646
if(MSVC)
4747

48-
if(X64_BITS)
48+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
4949
set(SFML_PATH libraries/SFML/VS/x64)
5050
else()
5151
set(SFML_PATH libraries/SFML/VS/x86)
5252
endif()
5353

5454
elseif(MINGW)
5555

56-
if(X64_BITS)
56+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
5757
set(SFML_PATH libraries/SFML/MinGW/x64)
5858
else()
5959
set(SFML_PATH libraries/SFML/MinGW/x86)

libraries/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ add_link_options(-lmingw32 -lgdi32 -luser32 -lkernel32 -ladvapi32 -lshell32 -lgc
1717
# SFML
1818
if(MSVC)
1919

20-
if(X64_BITS)
20+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
2121
set(LIB_SFML_PATH SFML/VS/x64)
2222
else()
2323
set(LIB_SFML_PATH SFML/VS/x86)
2424
endif()
2525

2626
elseif(MINGW)
2727

28-
if(X64_BITS)
28+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
2929
set(LIB_SFML_PATH SFML/MinGW/x64)
3030
else()
3131
set(LIB_SFML_PATH SFML/MinGW/x86)

mingw32_launch.bat

Lines changed: 0 additions & 4 deletions
This file was deleted.

mingw64_launch.bat

Lines changed: 0 additions & 4 deletions
This file was deleted.

mingw_run.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cmake -G "MinGW Makefiles" -B "./build" .
2+
cd build
3+
make
4+
cd ..
File renamed without changes.

vs32_launch.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

vs32_run.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cmake -G "Visual Studio 16 2019" -A Win32 -B "./build" .

vs64_launch.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

vs64_run.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cmake -G "Visual Studio 16 2019" -A x64 -B "./build" .

0 commit comments

Comments
 (0)