From 119dcdd1632c65e279fd50e43d665bd2ace3e8d4 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 2 Apr 2015 18:34:10 +0200 Subject: [PATCH] (iOS) Buildfix --- apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj | 8 ++++++++ griffin/griffin.c | 2 +- input/input_hid_driver.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 06a876e6a7..38b11ae32f 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -490,6 +490,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -552,6 +553,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -587,6 +589,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -653,6 +656,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -710,6 +714,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -769,6 +774,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -832,6 +838,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", @@ -868,6 +875,7 @@ "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", "-DHAVE_NETPLAY", + "-DHAVE_HID", "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", diff --git a/griffin/griffin.c b/griffin/griffin.c index 911c55ba6a..a987f2f638 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -382,7 +382,7 @@ INPUT (HID) #if defined(HAVE_LIBUSB) #include "../input/drivers_hid/libusb_hid.c" -#elif defined(__APPLE__) +#elif defined(__APPLE__) && !defined(IOS) #include "../input/drivers_hid/apple_hid.c" #endif diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c index 5a9a5a2fa0..b45b3c4df1 100644 --- a/input/input_hid_driver.c +++ b/input/input_hid_driver.c @@ -23,7 +23,7 @@ #include "../general.h" static hid_driver_t *hid_drivers[] = { -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(IOS) &apple_hid, #endif #ifdef HAVE_LIBUSB