From d03c53930bfa9f0265ec27223a6a4baa20bb0a73 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 18 Mar 2019 16:50:17 -0400
Subject: [PATCH 1/4] Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check

---
 CMakeLists.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eb065d0..11898db5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,14 +54,6 @@ macro(copy_files_to_build_dir target dlllist_var)
 	endif()
 endmacro()
 
-# 64-bit check
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-	message(STATUS "Target is 64-bit")
-	set(SRB2_SYSTEM_BITS 64)
-else()
-	set(SRB2_SYSTEM_BITS 32)
-endif()
-
 # OS macros
 if (UNIX)
 	add_definitions(-DUNIXCOMMON)
@@ -73,9 +65,6 @@ endif()
 
 if(${CMAKE_SYSTEM} MATCHES "Linux")
 	add_definitions(-DLINUX)
-	if(${SRB2_SYSTEM_BITS} EQUAL 64)
-		add_definitions(-DLINUX64)
-	endif()
 endif()
 
 if(${CMAKE_SYSTEM} MATCHES "Darwin")

From 6142becb4d88e638326c136982e6191aaa6a137d Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 18 Mar 2019 23:58:31 -0400
Subject: [PATCH 2/4] Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P
 check"

This reverts commit d03c53930bfa9f0265ec27223a6a4baa20bb0a73.
---
 CMakeLists.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11898db5..6eb065d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,14 @@ macro(copy_files_to_build_dir target dlllist_var)
 	endif()
 endmacro()
 
+# 64-bit check
+if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+	message(STATUS "Target is 64-bit")
+	set(SRB2_SYSTEM_BITS 64)
+else()
+	set(SRB2_SYSTEM_BITS 32)
+endif()
+
 # OS macros
 if (UNIX)
 	add_definitions(-DUNIXCOMMON)
@@ -65,6 +73,9 @@ endif()
 
 if(${CMAKE_SYSTEM} MATCHES "Linux")
 	add_definitions(-DLINUX)
+	if(${SRB2_SYSTEM_BITS} EQUAL 64)
+		add_definitions(-DLINUX64)
+	endif()
 endif()
 
 if(${CMAKE_SYSTEM} MATCHES "Darwin")

From 49dddf54ab4ee6ad41dd5c3b00d2f4af33cd9fe8 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 19 Mar 2019 00:04:14 -0400
Subject: [PATCH 3/4] CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eb065d0..75aa82f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,8 @@ macro(copy_files_to_build_dir target dlllist_var)
 endmacro()
 
 # 64-bit check
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+message(STATUS "CMAKE_SIZEOF_VOID_P=" ${CMAKE_SIZEOF_VOID_P})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	message(STATUS "Target is 64-bit")
 	set(SRB2_SYSTEM_BITS 64)
 else()

From 1c55daef2a5612bca39d47d490f82987cface0a9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 19 Mar 2019 09:10:25 -0400
Subject: [PATCH 4/4] CMake: have funny check for empty CMAKE_SIZEOF_VOID_P

---
 CMakeLists.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75aa82f3..0a5507b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,14 +54,19 @@ macro(copy_files_to_build_dir target dlllist_var)
 	endif()
 endmacro()
 
-# 64-bit check
-message(STATUS "CMAKE_SIZEOF_VOID_P=" ${CMAKE_SIZEOF_VOID_P})
+# bitness check
+set(SRB2_SYSTEM_BITS 0)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	message(STATUS "Target is 64-bit")
 	set(SRB2_SYSTEM_BITS 64)
-else()
+endif()
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+	message(STATUS "Target is 32-bit")
 	set(SRB2_SYSTEM_BITS 32)
 endif()
+if(${SRB2_SYSTEM_BITS} EQUAL 0)
+	message(STATUS "Target bitness is unknown")
+endif()
 
 # OS macros
 if (UNIX)