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

InputCommon: Enable ARC for obj-c++

Browse Source
This commit is contained in:
TellowKrinkle 2022-08-12 02:09:53 -05:00
parent d29b349a0c
commit b96bc4267e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,9 @@ elseif(APPLE)
${FORCEFEEDBACK_LIBRARY} ${FORCEFEEDBACK_LIBRARY}
${IOK_LIBRARY} ${IOK_LIBRARY}
) )
target_compile_options(inputcommon PRIVATE
-fobjc-arc
)
elseif(X11_FOUND) elseif(X11_FOUND)
target_sources(inputcommon PRIVATE target_sources(inputcommon PRIVATE
ControllerInterface/Xlib/XInput2.cpp ControllerInterface/Xlib/XInput2.cpp

2
Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
View File

@ -149,7 +149,7 @@ KeyboardAndMouse::KeyboardAndMouse(void* view)
AddCombinedInput("Shift", {"Left Shift", "Right Shift"}); AddCombinedInput("Shift", {"Left Shift", "Right Shift"});
AddCombinedInput("Ctrl", {"Left Control", "Right Control"}); AddCombinedInput("Ctrl", {"Left Control", "Right Control"});
NSView* cocoa_view = reinterpret_cast<NSView*>(view); NSView* cocoa_view = (__bridge NSView*)view;
// PopulateDevices may be called on the Emuthread, so we need to ensure that // PopulateDevices may be called on the Emuthread, so we need to ensure that
// these UI APIs are only ever called on the main thread. // these UI APIs are only ever called on the main thread.