ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128 from Sonicadvance1/linux_arch_defines 

Support _M_X86[_32/_64] on Linux.
This commit is contained in:
David Quintana 2014-07-15 17:04:20 +02:00
parent d3ebdae159 a1a0ed0563
commit c4d5267107
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/BuildParameters.cmake
View File

@ -92,7 +92,10 @@ if(_ARCH_64 AND 64BIT_BUILD)
endif() endif()
set(ARCH_FLAG "-m64 -msse -msse2") set(ARCH_FLAG "-m64 -msse -msse2")
add_definitions(-D_ARCH_64=1) add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1)
set(_ARCH_64 1)
set(_M_X86 1)
set(_M_X86_64 1)
else() else()
message("Compiling 32bit build on 32/64bit architecture") message("Compiling 32bit build on 32/64bit architecture")
# Do not search library in /usr/lib64 # Do not search library in /usr/lib64
@ -110,7 +113,10 @@ else()
endif() endif()
set(ARCH_FLAG "-m32 -msse -msse2 -march=i686") set(ARCH_FLAG "-m32 -msse -msse2 -march=i686")
add_definitions(-D_ARCH_32=1) add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1)
set(_ARCH_32 1)
set(_M_X86 1)
set(_M_X86_32 1)
endif() endif()
# * -fPIC option was removed for multiple reasons. # * -fPIC option was removed for multiple reasons.