dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-07 07:43:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InputCommon/CMakeLists: Link in ForceFeedback library explicitly on macOS

Browse Source 
Makes an implicit dependency explicit. Also makes the macOS libraries link privately
as they aren't used in the exposed interface.
This commit is contained in:
Lioncash 2018-03-29 11:53:19 -04:00
parent 53b3da7301
commit b8a4ab23dd
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -291,7 +291,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
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(FORCEFEEDBACK ForceFeedback)
find_library(OPENGL_LIBRARY OpenGL) find_library(OPENGL_LIBRARY OpenGL)
# Link against OS X system frameworks. # Link against OS X system frameworks.
@ -302,7 +301,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
${COREFUND_LIBRARY} ${COREFUND_LIBRARY}
${CORESERV_LIBRARY} ${CORESERV_LIBRARY}
${IOK_LIBRARY} ${IOK_LIBRARY}
${FORCEFEEDBACK}
) )
endif() endif()

4
Source/Core/InputCommon/CMakeLists.txt
View File

@ -40,6 +40,7 @@ elseif(APPLE)
find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
find_library(FORCEFEEDBACK_LIBRARY ForceFeedback)
target_sources(inputcommon PRIVATE target_sources(inputcommon PRIVATE
ControllerInterface/OSX/OSX.mm ControllerInterface/OSX/OSX.mm
ControllerInterface/OSX/OSXJoystick.mm ControllerInterface/OSX/OSXJoystick.mm
@ -47,10 +48,11 @@ elseif(APPLE)
ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
) )
target_link_libraries(inputcommon PUBLIC target_link_libraries(inputcommon PRIVATE
${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY}
${CARBON_LIBRARY} ${CARBON_LIBRARY}
${COCOA_LIBRARY} ${COCOA_LIBRARY}
${FORCEFEEDBACK_LIBRARY}
) )
elseif(X11_FOUND) elseif(X11_FOUND)
target_sources(inputcommon PRIVATE target_sources(inputcommon PRIVATE