diff --git a/CMakeLists.txt b/CMakeLists.txt index d1f080fdec..bcc45c29e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/native b/native index dc1e691ea8..3c13a90099 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit dc1e691ea8e70778d6559366d3e6372b31fe0bf5 +Subproject commit 3c13a9009999bf883c4c608d8b4f30a7d0c75560