From 723b9ba7167a2c606b0e54a2d87953a925606d86 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Apr 2015 15:59:20 +0200 Subject: [PATCH] Add HAVE_IOHIDMANAGER --- apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj | 2 ++ apple/RetroArch_OSX.xcodeproj/project.pbxproj | 2 ++ griffin/griffin.c | 2 +- input/input_hid_driver.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index 879add6b9b..88fd44c44f 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -282,6 +282,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", + "-DHAVE_IOHIDMANAGER", "-DHAVE_RGUI", "-DHAVE_MENU", "-DOSX", @@ -343,6 +344,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_GRIFFIN", + "-DHAVE_IOHIDMANAGER", "-DHAVE_RGUI", "-DHAVE_MENU", "-DOSX", diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 764eee0b83..85d62f9459 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -325,6 +325,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", + "-DHAVE_IOHIDMANAGER", "-DHAVE_LOCATION", "-DHAVE_RGUI", "-DHAVE_MENU", @@ -379,6 +380,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_CFLAGS = ( "-DHAVE_GRIFFIN", + "-DHAVE_IOHIDMANAGER", "-DHAVE_LOCATION", "-DHAVE_RGUI", "-DHAVE_MENU", diff --git a/griffin/griffin.c b/griffin/griffin.c index f369a8000a..53aa5d8daa 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -362,7 +362,7 @@ INPUT (HID) #if defined(__APPLE__) && defined(IOS) #include "../input/drivers_hid/btstack_hid.c" -#elif defined(__APPLE__) && !defined(IOS) +#elif defined(__APPLE__) && defined(HAVE_IOHIDMANAGER) #include "../input/drivers_hid/apple_hid.c" #endif diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c index 60bb6c5077..2912384e85 100644 --- a/input/input_hid_driver.c +++ b/input/input_hid_driver.c @@ -26,7 +26,7 @@ static hid_driver_t *hid_drivers[] = { #if defined(__APPLE__) && defined(IOS) &btstack_hid, #endif -#if defined(__APPLE__) && !defined(IOS) +#if defined(__APPLE__) && defined(HAVE_IOHIDMANAGER) &apple_hid, #endif #ifdef HAVE_LIBUSB