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

cmake: oups forget to change the usage of 64BIT_BUILD variable

This commit is contained in:
Gregory Hainaut 2014-09-13 14:22:41 +02:00
parent efa4a50cf5
commit 9c81272278
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/BuildParameters.cmake
View File

@ -78,7 +78,7 @@ if(_ARCH_64)
endif()
# 64 bits cross-compile specific configuration
if(_ARCH_64 AND 64BIT_BUILD)
if(_ARCH_64 AND 64BIT_BUILD_DONT_WORK)
message("Compiling 64bit build on 64bit architecture")
# Search library in /usr/lib64
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)

2
cmake/SearchForStuff.cmake
View File

@ -101,7 +101,7 @@ if(wxWidgets_FOUND)
if(Linux)
# Force the use of 32 bit library configuration on
# 64 bits machine with 32 bits library in /usr/lib32
if(_ARCH_64 AND NOT 64BIT_BUILD)
if(_ARCH_64 AND NOT 64BIT_BUILD_DONT_WORK)
## There is no guarantee that wx-config is a link to a 32 bits library. So you need to force the destinity
# Library can go into 3 path major paths (+ multiarch but you will see that later when implementation is done)
# 1/ /usr/lib32 (32 bits only)