diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index 1e18dd14b8..8b646d7d71 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -298,6 +298,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOA", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_NETPLAY", @@ -360,6 +361,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOA", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_NETPLAY", diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index aba32fb544..4e704cc107 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -341,6 +341,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOA", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_NETPLAY", @@ -396,6 +397,7 @@ "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", "-DHAVE_ZLIB", + "-DHAVE_COCOA", "-DWANT_ZLIB", "-DSINC_LOWER_QUALITY", "-DHAVE_NETPLAY", diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index 87a7379b8d..6dc595db5a 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -23,21 +23,27 @@ #define __IPHONE_OS_VERSION_MAX_ALLOWED 00000 #endif +#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA) #include "../gfx/drivers_context/apple_cocoa_gl.m" #include "../apple/common/apple_cocoa_common.m" +#if defined(HAVE_COCOATOUCH) + #if TARGET_OS_IPHONE -#include "../apple/iOS/platform.m" #include "../apple/iOS/menu.m" #include "../apple/iOS/browser.m" -#ifdef HAVE_COCOATOUCH +#include "../apple/iOS/platform.m" #include "../ui/drivers/ui_cocoatouch.m" #endif -#else + +#elif defined(HAVE_COCOA) + #include "../apple/OSX/platform.m" #include "../apple/OSX/settings.m" #endif +#endif + #ifdef HAVE_MFI #include "../input/drivers_hid/mfi_hid.m" #endif