Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7525 for code


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/src/OrxonoxConfig.cmake

    r7514 r7525  
    5353ENDIF()
    5454
    55 # 32/64 bit system check
    56 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
    57   SET(ORXONOX_ARCH_64 TRUE)
    58 ELSE()
    59   SET(ORXONOX_ARCH_32 TRUE)
    60 ENDIF()
    61 
    6255# Platforms
    6356SET(ORXONOX_PLATFORM_WINDOWS ${WIN32})
  • code/branches/ois_update/src/OrxonoxConfig.h.in

    r7514 r7525  
    8080
    8181// Architecture
    82 #cmakedefine ORXONOX_ARCH_32
    83 #cmakedefine ORXONOX_ARCH_64
     82#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
     83#   define ORXONOX_ARCH_64
     84#else
     85#   define ORXONOX_ARCH_32
     86#endif
    8487
    8588// See if we can use __forceinline or if we need to use __inline instead
Note: See TracChangeset for help on using the changeset viewer.