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

Darwin/OSX - cmake which enables apple build and hopefully won't break Linux build. 

OSX compilation fix: librt & not wxgl (yet).
This commit is contained in:
Juha Laukkanen 2015-11-17 21:09:33 +02:00
parent ade57809c1
commit b56197d30b
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/BuildParameters.cmake
View File

@ -248,7 +248,9 @@ set(AGGRESSIVE_WARNING "-Wstrict-aliasing -Wstrict-overflow=2 ")
if (USE_CLANG)
# -Wno-deprecated-register: glib issue...
set(DEFAULT_WARNINGS "${DEFAULT_WARNINGS} -Wno-deprecated-register")
set(COMMON_FLAG "${COMMON_FLAG} -no-integrated-as")
if (NOT APPLE)
set(COMMON_FLAG "${COMMON_FLAG} -no-integrated-as")
endif()
set(DBG "-g")
else()
set(DBG "-ggdb")

10
cmake/FindLibc.cmake
View File

@ -7,10 +7,16 @@ if(LIBC_LIBRARIES)
set(LIBC_FIND_QUIETLY TRUE)
endif(LIBC_LIBRARIES)
find_library(librt NAMES rt)
find_library(libdl NAMES dl)
find_library(libm NAMES m)
set(LIBC_LIBRARIES ${librt} ${libdl} ${libm})
# OSX doesn't have rt. On Linux timer and aio dependency.
if(APPLE)
set(LIBC_LIBRARIES ${librt} ${libdl} ${libm})
else()
find_library(librt NAMES rt)
set(LIBC_LIBRARIES ${librt} ${libdl} ${libm})
endif()
# handle the QUIETLY and REQUIRED arguments and set LIBC_FOUND to TRUE if
# all listed variables are TRUE

4
cmake/SearchForStuff.cmake
View File

@ -31,9 +31,9 @@ else()
list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
endif()
if(GTK3_API)
if(GTK3_API AND NOT APPLE)
list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
else()
elseif(NOT APPLE)
list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2)
endif()

6
cmake/SelectPcsx2Plugins.cmake
View File

@ -71,8 +71,8 @@ else()
set(pcsx2_core FALSE)
print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
endif()
# Linux need also gtk2
if(UNIX AND pcsx2_core AND NOT GTKn_FOUND)
# Linux, BSD, use gtk2, but not OSX
if(UNIX AND pcsx2_core AND NOT GTKn_FOUND AND NOT APPLE)
set(pcsx2_core FALSE)
print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
endif()
@ -253,7 +253,7 @@ endif()
# -SDL
# -common_libs
#---------------------------------------
if(ALSA_FOUND AND PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND SDLn_FOUND AND common_libs)
if(ALSA_FOUND OR PORTAUDIO_FOUND AND SOUNDTOUCH_FOUND AND SDLn_FOUND AND common_libs)
set(spu2-x TRUE)
elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/spu2-x")
set(spu2-x FALSE)