Merge remote-tracking branch 'origin/master' into Universal_Audio_Branch

This commit is contained in:
kaienfr committed 2014-04-12 00:20:26 +02:00
commit bd0e16c2d4
1 file changed
+2
+2
View File
@@ -50,8 +50,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
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()