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

CMake: remove unneeded macOS frameworks

This commit is contained in:
Michael Maltese 2017-01-23 23:58:33 -08:00
parent 0ab3b1a3ff
commit 4cbd07b81f
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -311,9 +311,6 @@ if(APPLE)
set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};/usr") set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};/usr")
endif() endif()
# Do not warn about frameworks that are not available on all architectures.
# This avoids a warning when linking with QuickTime.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings")
# Specify target CPUs. # Specify target CPUs.
set(TARGET_FLAGS "${TARGET_FLAGS} -mssse3") set(TARGET_FLAGS "${TARGET_FLAGS} -mssse3")
set(TARGET_FLAGS "${TARGET_FLAGS} -march=core2") set(TARGET_FLAGS "${TARGET_FLAGS} -march=core2")
@ -332,7 +329,6 @@ if(APPLE)
find_library(APPKIT_LIBRARY AppKit) find_library(APPKIT_LIBRARY AppKit)
find_library(APPSERV_LIBRARY ApplicationServices) find_library(APPSERV_LIBRARY ApplicationServices)
find_library(ATB_LIBRARY AudioToolbox)
find_library(AU_LIBRARY AudioUnit) find_library(AU_LIBRARY AudioUnit)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
@ -342,10 +338,19 @@ if(APPLE)
find_library(FOUNDATION_LIBRARY Foundation) find_library(FOUNDATION_LIBRARY Foundation)
find_library(IOB_LIBRARY IOBluetooth) find_library(IOB_LIBRARY IOBluetooth)
find_library(IOK_LIBRARY IOKit) find_library(IOK_LIBRARY IOKit)
find_library(QUICKTIME_LIBRARY QuickTime)
find_library(WEBKIT_LIBRARY WebKit)
find_library(FORCEFEEDBACK ForceFeedback) find_library(FORCEFEEDBACK ForceFeedback)
find_library(OPENGL_LIBRARY OpenGL) find_library(OPENGL_LIBRARY OpenGL)
# Link against OS X system frameworks.
list(APPEND LIBS
${APPKIT_LIBRARY}
${AU_LIBRARY}
${COREAUDIO_LIBRARY}
${COREFUND_LIBRARY}
${CORESERV_LIBRARY}
${IOK_LIBRARY}
${FORCEFEEDBACK}
)
endif() endif()
if(WIN32) if(WIN32)
@ -1010,19 +1015,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
set(LIBS ${LIBS} usbhid) set(LIBS ${LIBS} usbhid)
endif() endif()
if(APPLE)
# Link against OS X system frameworks.
list(APPEND LIBS
${APPKIT_LIBRARY}
${AU_LIBRARY}
${COREAUDIO_LIBRARY}
${COREFUND_LIBRARY}
${CORESERV_LIBRARY}
${IOK_LIBRARY}
${FORCEFEEDBACK}
)
endif()
######################################## ########################################
# Pre-build events: Define configuration variables and write SCM info header # Pre-build events: Define configuration variables and write SCM info header
# #

3
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -837,14 +837,13 @@ if(APPLE)
iconv iconv
${APPKIT_LIBRARY} ${APPKIT_LIBRARY}
${APPSERV_LIBRARY} ${APPSERV_LIBRARY}
${ATB_LIBRARY}
${CARBON_LIBRARY} ${CARBON_LIBRARY}
${COCOA_LIBRARY} ${COCOA_LIBRARY}
${COREFUND_LIBRARY} ${COREFUND_LIBRARY}
${CORESERV_LIBRARY} ${CORESERV_LIBRARY}
${IOK_LIBRARY} ${IOK_LIBRARY}
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY}) )
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 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_QUICKTIME 0
#define wxOSX_USE_AUDIOTOOLBOX 1 #define wxOSX_USE_AUDIOTOOLBOX 0
/* /*
Use the more efficient FSEvents API instead of kqueue Use the more efficient FSEvents API instead of kqueue

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

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