The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 07:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6558 from lioncash/input

Browse Source 
InputCommon/CMakeLists: Link in ForceFeedback library explicitly on macOS
This commit is contained in:
Léo Lam 2018-03-30 14:05:36 +02:00 committed by GitHub
commit 7833f1a931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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(IOB_LIBRARY IOBluetooth)
find_library(IOK_LIBRARY IOKit)
find_library(FORCEFEEDBACK ForceFeedback)
find_library(OPENGL_LIBRARY OpenGL)
# Link against OS X system frameworks.
@ -302,7 +301,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
${COREFUND_LIBRARY}
${CORESERV_LIBRARY}
${IOK_LIBRARY}
${FORCEFEEDBACK}
)
endif()

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

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