Mac buildfix

This commit is contained in:
Henrik Rydgård committed 2014-04-13 17:14:45 +02:00
1 parent e8d0cc6c89
commit 36b8ed8a27
2 files changed
+11 -10

No files matched your search

+10 -9
View File
@@ -48,15 +48,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if (NOT MOBILE_DEVICE)
set(USE_FFMPEG ON)
endif()
if (NOT ARM)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_M_X64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_M_X64")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_M_IX86")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_M_IX86")
endif()
endif()
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -64,6 +55,16 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(USE_FFMPEG ON)
endif()
if (NOT ARM AND NOT MIPS)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_M_X64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_M_X64")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_M_IX86")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_M_IX86")
endif()
endif()
if(NOT DEFINED HEADLESS)
set(HEADLESS OFF)
endif()
+1 -1
Submodule native updated: dc1e691ea8...3c13a90099.