From 86d0ad1aa2fbd3248dd1703c87836d49b013f9bc Mon Sep 17 00:00:00 2001
From: angeluriot <angel.uriot@gmail.com>
Date: Tue, 12 Sep 2023 21:46:04 +0200
Subject: [PATCH] Remove 64_BITS

---
 CMakeLists.txt                | 4 ++--
 libraries/CMakeLists.txt      | 4 ++--
 mingw32_launch.bat            | 4 ----
 mingw64_launch.bat            | 4 ----
 mingw_run.bat                 | 4 ++++
 unix_launch.sh => unix_run.sh | 0
 vs32_launch.bat               | 1 -
 vs32_run.bat                  | 1 +
 vs64_launch.bat               | 1 -
 vs64_run.bat                  | 1 +
 10 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 mingw32_launch.bat
 delete mode 100644 mingw64_launch.bat
 create mode 100644 mingw_run.bat
 rename unix_launch.sh => unix_run.sh (100%)
 delete mode 100644 vs32_launch.bat
 create mode 100644 vs32_run.bat
 delete mode 100644 vs64_launch.bat
 create mode 100644 vs64_run.bat

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a507cd4..cb3c19d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ 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)
@@ -53,7 +53,7 @@ if(MSVC)
 
 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)
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 5b4fa90..76f06a7 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -17,7 +17,7 @@ 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)
@@ -25,7 +25,7 @@ if(MSVC)
 
 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)
diff --git a/mingw32_launch.bat b/mingw32_launch.bat
deleted file mode 100644
index f09be9a..0000000
--- a/mingw32_launch.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake -G "MinGW Makefiles" -B "./build" -DX64_BITS=OFF .
-cd build
-make
-cd ..
diff --git a/mingw64_launch.bat b/mingw64_launch.bat
deleted file mode 100644
index d7e2eec..0000000
--- a/mingw64_launch.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake -G "MinGW Makefiles" -B "./build" -DX64_BITS=ON .
-cd build
-make
-cd ..
diff --git a/mingw_run.bat b/mingw_run.bat
new file mode 100644
index 0000000..b71f8c4
--- /dev/null
+++ b/mingw_run.bat
@@ -0,0 +1,4 @@
+cmake -G "MinGW Makefiles" -B "./build" .
+cd build
+make
+cd ..
diff --git a/unix_launch.sh b/unix_run.sh
similarity index 100%
rename from unix_launch.sh
rename to unix_run.sh
diff --git a/vs32_launch.bat b/vs32_launch.bat
deleted file mode 100644
index f8924cd..0000000
--- a/vs32_launch.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake -G "Visual Studio 16 2019" -A Win32 -B "./build" -DX64_BITS=OFF .
diff --git a/vs32_run.bat b/vs32_run.bat
new file mode 100644
index 0000000..ca6dbd5
--- /dev/null
+++ b/vs32_run.bat
@@ -0,0 +1 @@
+cmake -G "Visual Studio 16 2019" -A Win32 -B "./build" .
diff --git a/vs64_launch.bat b/vs64_launch.bat
deleted file mode 100644
index d9c24b9..0000000
--- a/vs64_launch.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake -G "Visual Studio 16 2019" -A x64 -B "./build" -DX64_BITS=ON .
diff --git a/vs64_run.bat b/vs64_run.bat
new file mode 100644
index 0000000..e719350
--- /dev/null
+++ b/vs64_run.bat
@@ -0,0 +1 @@
+cmake -G "Visual Studio 16 2019" -A x64 -B "./build" .