mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_COCOA define - refactor griffin_objc.m

Browse Source
This commit is contained in:
twinaphex 2015-04-19 16:29:53 +02:00
parent f18e1d0d5d
commit 31de846279
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj
View File

@ -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",

2
apple/RetroArch_OSX.xcodeproj/project.pbxproj
View File

@ -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",

12
griffin/griffin_objc.m
View File

@ -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