Merge pull request #183 from Sonicadvance1/Arch-fix

Fix arch detection on x86.
This commit is contained in:
Pierre Bourdon 2014-03-17 20:23:28 +01:00
commit 154dee8c6c

View File

@ -131,7 +131,9 @@ else()
add_definitions(-D_ARCH_32=1) add_definitions(-D_ARCH_32=1)
endif() endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR
${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86" OR
${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions(-msse2) add_definitions(-msse2)
set(_M_X86 1) set(_M_X86 1)
add_definitions(-D_M_X86=1) add_definitions(-D_M_X86=1)
@ -160,6 +162,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(_M_GENERIC 1) set(_M_GENERIC 1)
add_definitions(-D_M_GENERIC=1) add_definitions(-D_M_GENERIC=1)
else() else()
message("Warning! Building generic build!")
set(_M_GENERIC 1) set(_M_GENERIC 1)
add_definitions(-D_M_GENERIC=1) add_definitions(-D_M_GENERIC=1)
endif() endif()