(iOS) Buildfix

This commit is contained in:
Twinaphex 2015-04-02 18:34:10 +02:00
parent 6ea55bfaa9
commit 119dcdd163
3 changed files with 10 additions and 2 deletions

View File

@ -490,6 +490,7 @@
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -552,6 +553,7 @@
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -587,6 +589,7 @@
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -653,6 +656,7 @@
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -710,6 +714,7 @@
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -769,6 +774,7 @@
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -832,6 +838,7 @@
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",
@ -868,6 +875,7 @@
"-DNS_BLOCK_ASSERTIONS=1", "-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG", "-DNDEBUG",
"-DHAVE_NETPLAY", "-DHAVE_NETPLAY",
"-DHAVE_HID",
"-DHAVE_NETWORKING", "-DHAVE_NETWORKING",
"-DHAVE_CAMERA", "-DHAVE_CAMERA",
"-DHAVE_GRIFFIN", "-DHAVE_GRIFFIN",

View File

@ -382,7 +382,7 @@ INPUT (HID)
#if defined(HAVE_LIBUSB) #if defined(HAVE_LIBUSB)
#include "../input/drivers_hid/libusb_hid.c" #include "../input/drivers_hid/libusb_hid.c"
#elif defined(__APPLE__) #elif defined(__APPLE__) && !defined(IOS)
#include "../input/drivers_hid/apple_hid.c" #include "../input/drivers_hid/apple_hid.c"
#endif #endif

View File

@ -23,7 +23,7 @@
#include "../general.h" #include "../general.h"
static hid_driver_t *hid_drivers[] = { static hid_driver_t *hid_drivers[] = {
#ifdef __APPLE__ #if defined(__APPLE__) && !defined(IOS)
&apple_hid, &apple_hid,
#endif #endif
#ifdef HAVE_LIBUSB #ifdef HAVE_LIBUSB