piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4744 from ligfx/cleanup-osx-cmake

Browse Source 
CMake: Cleanup macOS-related logic
This commit is contained in:
Markus Wick
2017-01-24 14:36:10 +01:00
committed by GitHub
parent 63f56ccd02 c85127c973
commit eed64bb0fe
6 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -839,14 +839,13 @@ if(APPLE)
iconv
${APPKIT_LIBRARY}
${APPSERV_LIBRARY}
${ATB_LIBRARY}
${CARBON_LIBRARY}
${COCOA_LIBRARY}
${COREFUND_LIBRARY}
${CORESERV_LIBRARY}
${IOK_LIBRARY}
${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY})
)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

2
Externals/wxWidgets3/include/wx/osx/cocoa/chkconf.h vendored
View File

@ -48,7 +48,7 @@
*/
#define wxOSX_USE_QUICKTIME 0
#define wxOSX_USE_AUDIOTOOLBOX 1
#define wxOSX_USE_AUDIOTOOLBOX 0
/*
Use the more efficient FSEvents API instead of kqueue

2
Externals/wxWidgets3/wx/wxcocoa.h vendored
View File

@ -875,7 +875,7 @@
/*
* wxWebKitCtrl
*/
#define wxUSE_WEBKIT 1
#define wxUSE_WEBKIT 0
/*
* Objective-C class name uniquifying