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

cmake: regression to select SDL/GTK + 64bits fix

This commit is contained in:
Gregory Hainaut 2014-12-22 19:31:32 +01:00
parent 6830962c3a
commit d00666a4d9
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/SearchForStuff.cmake
View File

@ -150,9 +150,11 @@ include_directories(${CMAKE_SOURCE_DIR}/common/include
${CMAKE_SOURCE_DIR}/common/include/x86emitter ${CMAKE_SOURCE_DIR}/common/include/x86emitter
# File generated by Cmake # File generated by Cmake
${CMAKE_BINARY_DIR}/common/include ${CMAKE_BINARY_DIR}/common/include
# WORKAROUND Some issue with multiarch on Debian/Ubuntu
/usr/include/i386-linux-gnu
# WORKAROUND Clang integration issue with multiarch on Debian
#/usr/include/i386-linux-gnu/c++
#/usr/include/i386-linux-gnu/c++/4.8
) )
# WORKAROUND Some issue with multiarch on Debian/Ubuntu
if (64BIT_BUILD_DONT_WORK)
include_directories(/usr/include/x86_64-linux-gnu)
else()
include_directories(/usr/include/i386-linux-gnu)
endif()

13
cmake/SelectPcsx2Plugins.cmake
View File

@ -21,8 +21,17 @@ endif()
# Check for additional dependencies. # Check for additional dependencies.
# If all dependencies are available, including OS, build it # If all dependencies are available, including OS, build it
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
set(GTKn_FOUND GTK2_FOUND OR GTK3_FOUND) if (GTK2_FOUND OR GTK3_FOUND)
set(SDLn_FOUND SDL_FOUND OR SDL2_FOUND) set(GTKn_FOUND TRUE)
else()
set(GTKn_FOUND FALSE)
endif()
if(SDL_FOUND OR SDL2_FOUND)
set(SDLn_FOUND TRUE)
else()
set(SDLn_FOUND FALSE)
endif()
#--------------------------------------- #---------------------------------------
# Common libs # Common libs