diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 6ca6cb2fd3..e36685b9bf 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -8,11 +8,8 @@ /* Begin PBXBuildFile section */ 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; - 840222F51A889DE9009AB261 /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F41A889DE9009AB261 /* CFExtensions.m */; }; - 840222F71A889DFC009AB261 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F61A889DFC009AB261 /* RAGameView.m */; }; - 840222F91A889E0C009AB261 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F81A889E0C009AB261 /* utility.m */; }; + 509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; }; 840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; - 840365B51A88960400C51FB4 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 840365B41A88960400C51FB4 /* settings.m */; }; 841CBB881A8A343E0066E9F1 /* rdb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7F1A8A31650066E9F1 /* rdb */; }; 841CBB891A8A34420066E9F1 /* cursors in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7D1A8A314F0066E9F1 /* cursors */; }; 841CBB8A1A8A34470066E9F1 /* cht in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7B1A8A31370066E9F1 /* cht */; }; @@ -32,7 +29,6 @@ 84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB01A89E664007336C1 /* Cg.framework */; }; 84DD5EB81A89F1C7007336C1 /* retroarch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 84DD5EB71A89F1C7007336C1 /* retroarch.icns */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; - 8D11072D0486CEB800E47090 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* platform.m */; settings = {ATTRIBUTES = (); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -66,13 +62,9 @@ /* Begin PBXFileReference section */ 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = ""; }; 1DDD58150DA1D0A300B32029 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = OSX/en.lproj/MainMenu.xib; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = OSX/platform.m; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 840222F41A889DE9009AB261 /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = common/CFExtensions.m; sourceTree = ""; }; - 840222F61A889DFC009AB261 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = common/RAGameView.m; sourceTree = ""; }; - 840222F81A889E0C009AB261 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = common/utility.m; sourceTree = ""; }; + 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../griffin/griffin_objc.m; sourceTree = ""; }; 840222FB1A889EE2009AB261 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; - 840365B41A88960400C51FB4 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = OSX/settings.m; sourceTree = ""; }; 841CBB731A8A308C0066E9F1 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../media/assets; sourceTree = ""; }; 841CBB751A8A30CC0066E9F1 /* autoconfig */ = {isa = PBXFileReference; lastKnownFileType = folder; name = autoconfig; path = ../media/autoconfig; sourceTree = ""; }; 841CBB771A8A30F00066E9F1 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../media/overlays; sourceTree = ""; }; @@ -81,8 +73,6 @@ 841CBB7D1A8A314F0066E9F1 /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../media/libretrodb/cursors; sourceTree = ""; }; 841CBB7F1A8A31650066E9F1 /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../media/libretrodb/rdb; sourceTree = ""; }; 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; - 84DD5EA11A89658D007336C1 /* RetroArch_Apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RetroArch_Apple.h; path = common/RetroArch_Apple.h; sourceTree = ""; }; - 84DD5EA21A896816007336C1 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = OSX/platform.h; sourceTree = ""; }; 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = /System/Library/Frameworks/AVFoundation.framework; sourceTree = ""; }; 84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = ""; }; 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; @@ -160,8 +150,6 @@ isa = PBXGroup; children = ( 840222FA1A889EA2009AB261 /* Core */, - 840222F21A889D62009AB261 /* Common */, - 84F678D51A889446000C8F9C /* OSX */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 841CBB821A8A33810066E9F1 /* Assets */, @@ -202,20 +190,10 @@ name = Frameworks; sourceTree = ""; }; - 840222F21A889D62009AB261 /* Common */ = { - isa = PBXGroup; - children = ( - 84DD5EA11A89658D007336C1 /* RetroArch_Apple.h */, - 840222F41A889DE9009AB261 /* CFExtensions.m */, - 840222F61A889DFC009AB261 /* RAGameView.m */, - 840222F81A889E0C009AB261 /* utility.m */, - ); - name = Common; - sourceTree = ""; - }; 840222FA1A889EA2009AB261 /* Core */ = { isa = PBXGroup; children = ( + 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */, 840222FB1A889EE2009AB261 /* griffin.c */, ); name = Core; @@ -243,16 +221,6 @@ name = Assets; sourceTree = ""; }; - 84F678D51A889446000C8F9C /* OSX */ = { - isa = PBXGroup; - children = ( - 84DD5EA21A896816007336C1 /* platform.h */, - 840365B41A88960400C51FB4 /* settings.m */, - 29B97316FDCFA39411CA2CEA /* platform.m */, - ); - name = OSX; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -317,11 +285,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D11072D0486CEB800E47090 /* platform.m in Sources */, - 840365B51A88960400C51FB4 /* settings.m in Sources */, - 840222F51A889DE9009AB261 /* CFExtensions.m in Sources */, - 840222F71A889DFC009AB261 /* RAGameView.m in Sources */, - 840222F91A889E0C009AB261 /* utility.m in Sources */, + 509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */, 840222FC1A889EE2009AB261 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index ac3ff7dd2a..90a0db44b7 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -7,22 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 501232C8192E5FB00063A359 /* apple_gamecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232C7192E5FB00063A359 /* apple_gamecontroller.m */; }; 501232CA192E5FC40063A359 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; - 501232D6192E60580063A359 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D5192E60580063A359 /* platform.m */; }; - 501232D8192E605F0063A359 /* browser.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D7192E605F0063A359 /* browser.m */; }; - 501232DA192E606D0063A359 /* menu.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D9192E606D0063A359 /* menu.m */; }; 501881EC184BAD6D006F665D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881EB184BAD6D006F665D /* AVFoundation.framework */; }; 501881EE184BB54C006F665D /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881ED184BB54C006F665D /* CoreMedia.framework */; }; 5041BAF41A9D40D000A77A33 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 5073C58A196C0BA40026E146 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5073C587196C0BA40026E146 /* RAGameView.m */; }; - 5073C58B196C0BA40026E146 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 5073C588196C0BA40026E146 /* utility.m */; }; + 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; 50CCC828185E0E7D001F5BC8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */; }; 50D00E8E19D117C400EBA71E /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 50E7189F184B88AA001956CE /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E7189E184B88AA001956CE /* CoreVideo.framework */; }; - 6949E72319FABADC00CC7F42 /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6949E72219FABADC00CC7F42 /* CFExtensions.m */; }; 696012F219F3389A006A1088 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696012F119F3389A006A1088 /* CoreText.framework */; }; 69D31DE41A547EC800EF4C92 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69D31DE31A547EC800EF4C92 /* Media.xcassets */; }; 83D632E219ECFCC4009E3161 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DB19ECFCC4009E3161 /* ic_pause.png */; }; @@ -45,21 +39,15 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 501232C7192E5FB00063A359 /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = apple_gamecontroller.m; path = ../common/apple_gamecontroller.m; sourceTree = ""; }; 501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = ""; }; 501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/drivers_resampler/sinc_neon.S; sourceTree = SOURCE_ROOT; }; 501232CD192E5FE30063A359 /* audio_utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = audio_utils_neon.S; path = ../../audio/audio_utils_neon.S; sourceTree = SOURCE_ROOT; }; - 501232D5192E60580063A359 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = platform.m; sourceTree = ""; }; - 501232D7192E605F0063A359 /* browser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = browser.m; sourceTree = ""; }; - 501232D9192E606D0063A359 /* menu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = menu.m; sourceTree = ""; }; 501881EB184BAD6D006F665D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 501881ED184BB54C006F665D /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - 5073C587196C0BA40026E146 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; - 5073C588196C0BA40026E146 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; }; + 50521A431AA23BF500185CC9 /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = ""; }; 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = cc_resampler_neon.S; path = ../../audio/drivers_resampler/cc_resampler_neon.S; sourceTree = ""; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - 6949E72219FABADC00CC7F42 /* CFExtensions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = ""; }; 696012F119F3389A006A1088 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 69D31DE31A547EC800EF4C92 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = ""; }; 83D632DB19ECFCC4009E3161 /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_pause.png; sourceTree = ""; }; @@ -110,17 +98,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 501232C6192E5F940063A359 /* ios */ = { - isa = PBXGroup; - children = ( - 501232D9192E606D0063A359 /* menu.m */, - 501232D7192E605F0063A359 /* browser.m */, - 501232D5192E60580063A359 /* platform.m */, - 501232C7192E5FB00063A359 /* apple_gamecontroller.m */, - ); - name = ios; - sourceTree = ""; - }; 83D632D719ECFCC4009E3161 /* Assets */ = { isa = PBXGroup; children = ( @@ -150,11 +127,8 @@ 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( - 6949E72219FABADC00CC7F42 /* CFExtensions.m */, 83D632D719ECFCC4009E3161 /* Assets */, 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */, - 501232C6192E5F940063A359 /* ios */, - 96AFAE3316C1D4EA009DE44C /* common */, 96AFAE9C16C1D976009DE44C /* core */, 96AFAE2816C1D4EA009DE44C /* Frameworks */, 96AFAE2616C1D4EA009DE44C /* Products */, @@ -192,15 +166,6 @@ name = Frameworks; sourceTree = ""; }; - 96AFAE3316C1D4EA009DE44C /* common */ = { - isa = PBXGroup; - children = ( - 5073C587196C0BA40026E146 /* RAGameView.m */, - 5073C588196C0BA40026E146 /* utility.m */, - ); - path = common; - sourceTree = ""; - }; 96AFAE3416C1D4EA009DE44C /* Supporting Files */ = { isa = PBXGroup; children = ( @@ -251,6 +216,7 @@ D48581DC16F823E2004BEB17 /* griffin */ = { isa = PBXGroup; children = ( + 50521A431AA23BF500185CC9 /* griffin_objc.m */, 501232C9192E5FC40063A359 /* griffin.c */, ); name = griffin; @@ -333,15 +299,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6949E72319FABADC00CC7F42 /* CFExtensions.m in Sources */, 50D00E8E19D117C400EBA71E /* cc_resampler_neon.S in Sources */, - 5073C58B196C0BA40026E146 /* utility.m in Sources */, - 501232DA192E606D0063A359 /* menu.m in Sources */, - 501232D8192E605F0063A359 /* browser.m in Sources */, - 501232D6192E60580063A359 /* platform.m in Sources */, + 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */, 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */, - 501232C8192E5FB00063A359 /* apple_gamecontroller.m in Sources */, - 5073C58A196C0BA40026E146 /* RAGameView.m in Sources */, 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */, 501232CA192E5FC40063A359 /* griffin.c in Sources */, ); diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m new file mode 100644 index 0000000000..c1f679241a --- /dev/null +++ b/griffin/griffin_objc.m @@ -0,0 +1,15 @@ +#include "../apple/common/CFExtensions.m" +#include "../apple/common/utility.m" + +#include "../apple/common/RAGameView.m" + +#if defined(OSX) +#include "../apple/OSX/platform.m" +#include "../apple/OSX/settings.m" +#elif defined(IOS) +#include "../apple/iOS/platform.m" +#include "../apple/iOS/menu.m" +#include "../apple/iOS/browser.m" + +#include "../apple/common/apple_gamecontroller.m" +#endif \ No newline at end of file