From f18e1d0d5dca1df7be0ee680902c98f7aef00294 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Apr 2015 16:24:51 +0200 Subject: [PATCH] Add HAVE_COCOATOUCH --- apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj | 8 ++++++++ griffin/griffin_objc.m | 2 ++ ui/ui_companion_driver.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index b89c9ee861..7c64d2a5c5 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -513,6 +513,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DRARCH_INTERNAL", @@ -576,6 +577,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DRARCH_INTERNAL", @@ -613,6 +615,7 @@ "-DRARCH_INTERNAL", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_THREADS", @@ -682,6 +685,7 @@ "-DHAVE_FBO", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", ); @@ -740,6 +744,7 @@ "-DHAVE_FBO", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", ); @@ -797,6 +802,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DRARCH_INTERNAL", @@ -861,6 +867,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DRARCH_INTERNAL", @@ -899,6 +906,7 @@ "-DRARCH_INTERNAL", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOATOUCH", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_THREADS", diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index b0fe28c0ff..87a7379b8d 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -30,7 +30,9 @@ #include "../apple/iOS/platform.m" #include "../apple/iOS/menu.m" #include "../apple/iOS/browser.m" +#ifdef HAVE_COCOATOUCH #include "../ui/drivers/ui_cocoatouch.m" +#endif #else #include "../apple/OSX/platform.m" #include "../apple/OSX/settings.m" diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index 4e5d141a80..010f1c0922 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -22,7 +22,7 @@ #endif static const ui_companion_driver_t *ui_companion_drivers[] = { -#ifdef IOS +#ifdef HAVE_COCOATOUCH &ui_companion_cocoatouch, #endif #ifdef HAVE_QT