diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 06ffb37a2d..80c2415744 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -124,6 +124,9 @@ elseif(APPLE) ${FORCEFEEDBACK_LIBRARY} ${IOK_LIBRARY} ) + target_compile_options(inputcommon PRIVATE + -fobjc-arc + ) elseif(X11_FOUND) target_sources(inputcommon PRIVATE ControllerInterface/Xlib/XInput2.cpp diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index b8ae0219be..9cc8d07926 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -149,7 +149,7 @@ KeyboardAndMouse::KeyboardAndMouse(void* view) AddCombinedInput("Shift", {"Left Shift", "Right Shift"}); AddCombinedInput("Ctrl", {"Left Control", "Right Control"}); - NSView* cocoa_view = reinterpret_cast(view); + NSView* cocoa_view = (__bridge NSView*)view; // PopulateDevices may be called on the Emuthread, so we need to ensure that // these UI APIs are only ever called on the main thread.