Changeset 7525 for code/branches

Timestamp:

Oct 11, 2010, 11:08:26 PM (14 years ago)

Author:

rgrieder

Message:

Architecture (32/64 bit) should be determined at compile time because the CMake variable is not reliable (nor is it well possible to do for CMake).
We should still treat this carefully: You can build universal binaries on OS X with both 32 and 64 bit support (sounds like a nightmare for hardware-near development…).

Location:

code/branches/ois_update/src

Files:

• OrxonoxConfig.cmake (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (1 diff)

code/branches/ois_update/src/OrxonoxConfig.cmake

@@ -53 +53 @@
 ENDIF()
 
-# 32/64 bit system check
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(ORXONOX_ARCH_64 TRUE)
-ELSE()
-  SET(ORXONOX_ARCH_32 TRUE)
-ENDIF()
-
 # Platforms
 SET(ORXONOX_PLATFORM_WINDOWS ${WIN32})

code/branches/ois_update/src/OrxonoxConfig.h.in

@@ -80 +80 @@
 
 // Architecture
-#cmakedefine ORXONOX_ARCH_32
-#cmakedefine ORXONOX_ARCH_64
+#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
+#   define ORXONOX_ARCH_64
+#else
+#   define ORXONOX_ARCH_32
+#endif
 
 // See if we can use __forceinline or if we need to use __inline instead