Explorar o código

Fixed 64bit build on Linux.

Lasse Öörni %!s(int64=12) %!d(string=hai) anos
pai
achega
5f6714920f
Modificáronse 1 ficheiros con 17 adicións e 5 borrados
  1. 17 5
      CMakeLists.txt

+ 17 - 5
CMakeLists.txt

@@ -1,3 +1,5 @@
+include (CheckIncludeFiles)
+
 # Disable unnecessary build types
 set (CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Debug;Release" CACHE STRING "Configurations" FORCE)
 
@@ -53,6 +55,18 @@ if (NOT WIN32)
     add_definitions (-DUNIX)
 endif ()
 
+# Check existence of stdint.h for LibCpuId
+CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)
+if (HAVE_STDINT_H)
+    add_definitions(-DHAVE_STDINT_H)
+endif ()
+
+# Add definitions for GLEW
+if (NOT IOS AND USE_OPENGL)
+    add_definitions(-DGLEW_STATIC)
+    add_definitions(-DGLEW_NO_GLU)
+endif ()
+
 # Platform and compiler specific options
 if (IOS)
     # IOS-specific setup
@@ -100,10 +114,10 @@ else ()
             if (ENABLE_SSE)
                 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse")
                 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
-            endif ()
-        else ()
+            endif ()
+        else ()
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
         endif ()
         if (WIN32)
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc")
@@ -194,8 +208,6 @@ add_subdirectory (Urho3D)
 if (NOT IOS)
     if (USE_OPENGL)
         add_subdirectory (ThirdParty/GLEW)
-        add_definitions(-DGLEW_STATIC)
-        add_definitions(-DGLEW_NO_GLU)
     endif ()
     add_subdirectory (ThirdParty/Assimp)
     add_subdirectory (ThirdParty/LibCpuId)