From dd2d15c144ee8f95e0a5e15f2a18a8c3a21f72d4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 22 May 2014 18:54:10 +0200 Subject: [PATCH] (Apple) Move iOS/OSX to separate dirs so that both ports can have their own modules/ directory --- apple/OSX/{ => OSX/OSX}/RetroArch-Info.plist | 0 apple/OSX/{ => OSX/OSX}/RetroArch.icns | Bin .../{ => OSX/OSX}/en.lproj/InfoPlist.strings | 0 apple/OSX/{ => OSX/OSX}/en.lproj/MainMenu.xib | 0 apple/OSX/{ => OSX/OSX}/en.lproj/Settings.xib | 0 .../RetroArch_OSX.xcodeproj/project.pbxproj | 48 +++--- .../contents.xcworkspacedata | 0 .../xcshareddata/RetroArch_OSX.xccheckout | 41 +++++ .../.empty.txt => OSX/OSX/modules/.empty} | 0 .../RetroArch_iOS.xcodeproj/project.pbxproj | 150 +++++++++--------- .../contents.xcworkspacedata | 0 .../xcshareddata/RetroArch_iOS.xccheckout | 53 +++++++ apple/iOS/bluetooth/btdynamic.c | 2 +- apple/iOS/bluetooth/btdynamic.h | 2 +- apple/iOS/bluetooth/btpad.c | 2 +- apple/iOS/browser.m | 8 +- apple/iOS/{ => iOS}/RetroArch-Info.plist | 0 .../iOS/{ => iOS}/en.lproj/InfoPlist.strings | 0 apple/iOS/menu.m | 2 +- apple/iOS/modules/.empty | 0 apple/iOS/platform.m | 4 +- apple/iOS/views.h | 2 +- apple/script/build | 2 +- audio/coreaudio.c | 6 +- 24 files changed, 212 insertions(+), 110 deletions(-) rename apple/OSX/{ => OSX/OSX}/RetroArch-Info.plist (100%) rename apple/OSX/{ => OSX/OSX}/RetroArch.icns (100%) rename apple/OSX/{ => OSX/OSX}/en.lproj/InfoPlist.strings (100%) rename apple/OSX/{ => OSX/OSX}/en.lproj/MainMenu.xib (100%) rename apple/OSX/{ => OSX/OSX}/en.lproj/Settings.xib (100%) rename apple/{ => OSX/OSX}/RetroArch_OSX.xcodeproj/project.pbxproj (87%) rename apple/{ => OSX/OSX}/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) create mode 100644 apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout rename apple/{modules/.empty.txt => OSX/OSX/modules/.empty} (100%) rename apple/{ => iOS}/RetroArch_iOS.xcodeproj/project.pbxproj (74%) rename apple/{ => iOS}/RetroArch_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) create mode 100644 apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout rename apple/iOS/{ => iOS}/RetroArch-Info.plist (100%) rename apple/iOS/{ => iOS}/en.lproj/InfoPlist.strings (100%) create mode 100644 apple/iOS/modules/.empty diff --git a/apple/OSX/RetroArch-Info.plist b/apple/OSX/OSX/OSX/RetroArch-Info.plist similarity index 100% rename from apple/OSX/RetroArch-Info.plist rename to apple/OSX/OSX/OSX/RetroArch-Info.plist diff --git a/apple/OSX/RetroArch.icns b/apple/OSX/OSX/OSX/RetroArch.icns similarity index 100% rename from apple/OSX/RetroArch.icns rename to apple/OSX/OSX/OSX/RetroArch.icns diff --git a/apple/OSX/en.lproj/InfoPlist.strings b/apple/OSX/OSX/OSX/en.lproj/InfoPlist.strings similarity index 100% rename from apple/OSX/en.lproj/InfoPlist.strings rename to apple/OSX/OSX/OSX/en.lproj/InfoPlist.strings diff --git a/apple/OSX/en.lproj/MainMenu.xib b/apple/OSX/OSX/OSX/en.lproj/MainMenu.xib similarity index 100% rename from apple/OSX/en.lproj/MainMenu.xib rename to apple/OSX/OSX/OSX/en.lproj/MainMenu.xib diff --git a/apple/OSX/en.lproj/Settings.xib b/apple/OSX/OSX/OSX/en.lproj/Settings.xib similarity index 100% rename from apple/OSX/en.lproj/Settings.xib rename to apple/OSX/OSX/OSX/en.lproj/Settings.xib diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj similarity index 87% rename from apple/RetroArch_OSX.xcodeproj/project.pbxproj rename to apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj index bead1847f6..491ddb832a 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj @@ -7,18 +7,18 @@ objects = { /* Begin PBXBuildFile section */ + 50351E75192E5DF200668AB1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E74192E5DF200668AB1 /* main.m */; }; + 50351E77192E5E1300668AB1 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 50351E76192E5E1300668AB1 /* griffin.c */; }; + 50351E79192E5E3C00668AB1 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E78192E5E3C00668AB1 /* utility.m */; }; + 50351E7B192E5E6100668AB1 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7A192E5E6100668AB1 /* RAGameView.m */; }; + 50351E7D192E5E8900668AB1 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7C192E5E8900668AB1 /* settings.m */; }; + 50351E7F192E5EC100668AB1 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7E192E5EC100668AB1 /* platform.m */; }; 50535530185E0F4000926C26 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5053552F185E0F4000926C26 /* CoreLocation.framework */; }; - 9620F663178FD4D3001B3B81 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 9620F662178FD4D3001B3B81 /* settings.m */; }; 962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; }; 96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; }; - 9646869817BBC14E00C5EA69 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 9646869617BBC14E00C5EA69 /* platform.m */; }; 964DE7C417D84B57001CBB6C /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C617D84B57001CBB6C /* Settings.xib */; }; 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; }; 967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; }; - 967894961788ED1100D6CA69 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 967894951788ED1100D6CA69 /* main.m */; }; - 9678949D1788F02600D6CA69 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 967894971788F02600D6CA69 /* RAGameView.m */; }; - 9678949F1788F02600D6CA69 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 9678949C1788F02600D6CA69 /* utility.m */; }; - 967894A11788F07D00D6CA69 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 967894A01788F07D00D6CA69 /* griffin.c */; }; 967894A41788F0C200D6CA69 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A21788F0C200D6CA69 /* CoreAudio.framework */; }; 967894A51788F0C200D6CA69 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */; }; 967894A71788F0D900D6CA69 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A61788F0D900D6CA69 /* OpenGL.framework */; }; @@ -28,23 +28,23 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 50351E74192E5DF200668AB1 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../../../common/main.m; sourceTree = ""; }; + 50351E76192E5E1300668AB1 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../../../griffin/griffin.c; sourceTree = ""; }; + 50351E78192E5E3C00668AB1 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../../../common/utility.m; sourceTree = ""; }; + 50351E7A192E5E6100668AB1 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../../../common/RAGameView.m; sourceTree = ""; }; + 50351E7C192E5E8900668AB1 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = ../../settings.m; sourceTree = ""; }; + 50351E7E192E5EC100668AB1 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../../platform.m; sourceTree = ""; }; 5053552F185E0F4000926C26 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - 9620F662178FD4D3001B3B81 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = OSX/settings.m; sourceTree = SOURCE_ROOT; }; 962EE0E1178B3DF6004224FF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 96355CDF1788E72A0010DBFA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96355CE21788E72A0010DBFA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 96355CE51788E72A0010DBFA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 96355CE61788E72A0010DBFA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; 96355CE71788E72A0010DBFA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 9646869617BBC14E00C5EA69 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = OSX/platform.m; sourceTree = SOURCE_ROOT; }; 964DE7C517D84B57001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Settings.xib; sourceTree = ""; }; 9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = SOURCE_ROOT; }; 967894901788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; 967894921788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; - 967894951788ED1100D6CA69 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 967894971788F02600D6CA69 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAGameView.m; sourceTree = ""; }; - 9678949C1788F02600D6CA69 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utility.m; sourceTree = ""; }; - 967894A01788F07D00D6CA69 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = ""; }; 967894A21788F0C200D6CA69 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreAudio.framework; sourceTree = DEVELOPER_DIR; }; 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreAudioKit.framework; sourceTree = DEVELOPER_DIR; }; 967894A61788F0D900D6CA69 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; @@ -110,12 +110,12 @@ 96355CE81788E72A0010DBFA /* common */ = { isa = PBXGroup; children = ( - 9646869617BBC14E00C5EA69 /* platform.m */, - 9620F662178FD4D3001B3B81 /* settings.m */, - 967894A01788F07D00D6CA69 /* griffin.c */, - 967894971788F02600D6CA69 /* RAGameView.m */, - 9678949C1788F02600D6CA69 /* utility.m */, - 967894951788ED1100D6CA69 /* main.m */, + 50351E7E192E5EC100668AB1 /* platform.m */, + 50351E7C192E5E8900668AB1 /* settings.m */, + 50351E7A192E5E6100668AB1 /* RAGameView.m */, + 50351E78192E5E3C00668AB1 /* utility.m */, + 50351E76192E5E1300668AB1 /* griffin.c */, + 50351E74192E5DF200668AB1 /* main.m */, ); path = common; sourceTree = ""; @@ -206,12 +206,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 967894961788ED1100D6CA69 /* main.m in Sources */, - 9678949D1788F02600D6CA69 /* RAGameView.m in Sources */, - 9678949F1788F02600D6CA69 /* utility.m in Sources */, - 967894A11788F07D00D6CA69 /* griffin.c in Sources */, - 9620F663178FD4D3001B3B81 /* settings.m in Sources */, - 9646869817BBC14E00C5EA69 /* platform.m in Sources */, + 50351E79192E5E3C00668AB1 /* utility.m in Sources */, + 50351E77192E5E1300668AB1 /* griffin.c in Sources */, + 50351E75192E5DF200668AB1 /* main.m in Sources */, + 50351E7D192E5E8900668AB1 /* settings.m in Sources */, + 50351E7F192E5EC100668AB1 /* platform.m in Sources */, + 50351E7B192E5E6100668AB1 /* RAGameView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from apple/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout new file mode 100644 index 0000000000..49b4fa923e --- /dev/null +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 68627F4F-2F04-453A-B5AC-5C4A2718C870 + IDESourceControlProjectName + RetroArch_OSX + IDESourceControlProjectOriginsDictionary + + 70479BD4-5741-48BF-B723-C0C79B64DF9A + https://github.com/libretro/RetroArch.git + + IDESourceControlProjectPath + apple/RetroArch_OSX.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 70479BD4-5741-48BF-B723-C0C79B64DF9A + ../../.. + + IDESourceControlProjectURL + https://github.com/libretro/RetroArch.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 70479BD4-5741-48BF-B723-C0C79B64DF9A + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 70479BD4-5741-48BF-B723-C0C79B64DF9A + IDESourceControlWCCName + retroarch + + + + diff --git a/apple/modules/.empty.txt b/apple/OSX/OSX/modules/.empty similarity index 100% rename from apple/modules/.empty.txt rename to apple/OSX/OSX/modules/.empty diff --git a/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj similarity index 74% rename from apple/RetroArch_iOS.xcodeproj/project.pbxproj rename to apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 9a95c86c90..0b5b576e80 100644 --- a/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -7,32 +7,33 @@ 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 /* utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* utils_neon.S */; }; + 501232D0192E60220063A359 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232CF192E60220063A359 /* main.m */; }; + 501232D2192E60380063A359 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D1192E60380063A359 /* RAGameView.m */; }; + 501232D4192E60420063A359 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D3192E60420063A359 /* utility.m */; }; + 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 */; }; - 509FC979183F9F18007A5A30 /* menu.m in Sources */ = {isa = PBXBuildFile; fileRef = 509FC978183F9F18007A5A30 /* menu.m */; }; 50CCC828185E0E7D001F5BC8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */; }; - 50DA5C05191EEECE0072AF07 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50DA5C04191EEECE0072AF07 /* sinc_neon.S */; }; - 50DA5C07191EEED70072AF07 /* utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50DA5C06191EEED70072AF07 /* utils_neon.S */; }; 50E7189F184B88AA001956CE /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E7189E184B88AA001956CE /* CoreVideo.framework */; }; - 50F54A871848F9FC00E19EFD /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 50F54A861848F9FC00E19EFD /* ic_pause.png */; }; + 50FE5B1D192E6211000FED1B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B1A192E6211000FED1B /* Default-568h@2x.png */; }; + 50FE5B1E192E6211000FED1B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B1B192E6211000FED1B /* Default.png */; }; + 50FE5B1F192E6211000FED1B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B1C192E6211000FED1B /* Default@2x.png */; }; + 50FE5B22192E6229000FED1B /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B20192E6229000FED1B /* Icon-72.png */; }; + 50FE5B23192E6229000FED1B /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B21192E6229000FED1B /* Icon.png */; }; + 50FE5B25192E623E000FED1B /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B24192E623E000FED1B /* ic_pause.png */; }; + 50FE5B27192E624E000FED1B /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50FE5B26192E624E000FED1B /* PauseIndicatorView.xib */; }; 962979F616C43B9500E6DCE0 /* ic_dir.png in Resources */ = {isa = PBXBuildFile; fileRef = 962979F416C43B9500E6DCE0 /* ic_dir.png */; }; 962979F716C43B9500E6DCE0 /* ic_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 962979F516C43B9500E6DCE0 /* ic_file.png */; }; - 96297A0F16C5AEA100E6DCE0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 96297A0E16C5AEA100E6DCE0 /* main.m */; }; 96297A2716C82FF100E6DCE0 /* overlays in Resources */ = {isa = PBXBuildFile; fileRef = 96297A2616C82FF100E6DCE0 /* overlays */; }; - 96337E82176AC6E5004685F3 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 96337E81176AC6E5004685F3 /* utility.m */; }; 96366C5516C9AC3300D64A22 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5416C9AC3300D64A22 /* CoreAudio.framework */; }; 96366C5916C9ACF500D64A22 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5816C9ACF500D64A22 /* AudioToolbox.framework */; }; - 963C3C32186E3D2600A6EB1E /* apple_gamecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 963C3C31186E3D2600A6EB1E /* apple_gamecontroller.m */; }; 963C3C34186E3DED00A6EB1E /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 963F5AC816CC523B009BBD19 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 963F5AC516CC523B009BBD19 /* RAGameView.m */; }; - 9646869517BBBEAE00C5EA69 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 9646869417BBBEAE00C5EA69 /* platform.m */; }; - 966B9CBD16E41E7A005B61E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CB816E41E7A005B61E1 /* Default-568h@2x.png */; }; - 966B9CBF16E41E7A005B61E1 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CB916E41E7A005B61E1 /* Default.png */; }; - 966B9CC116E41E7A005B61E1 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CBA16E41E7A005B61E1 /* Default@2x.png */; }; - 966B9CC316E41E7A005B61E1 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CBB16E41E7A005B61E1 /* Icon-72.png */; }; - 966B9CC516E41E7A005B61E1 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CBC16E41E7A005B61E1 /* Icon.png */; }; - 966B9CCB16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */; }; - 9678945B1788EAAE00D6CA69 /* browser.m in Sources */ = {isa = PBXBuildFile; fileRef = 967894571788EAAE00D6CA69 /* browser.m */; }; 967894631788EBD800D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 967894611788EBD800D6CA69 /* InfoPlist.strings */; }; 967D647516E6EA04006BA1F2 /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 967D647416E6EA04006BA1F2 /* modules */; }; 96AFAE2A16C1D4EA009DE44C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2916C1D4EA009DE44C /* UIKit.framework */; }; @@ -40,36 +41,36 @@ 96AFAE2E16C1D4EA009DE44C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2D16C1D4EA009DE44C /* CoreGraphics.framework */; }; 96AFAE3016C1D4EA009DE44C /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2F16C1D4EA009DE44C /* GLKit.framework */; }; 96AFAE3216C1D4EA009DE44C /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE3116C1D4EA009DE44C /* OpenGLES.framework */; }; - D48581DE16F823F9004BEB17 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = D48581DD16F823F9004BEB17 /* griffin.c */; }; /* 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/sinc_neon.S; sourceTree = ""; }; + 501232CD192E5FE30063A359 /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = utils_neon.S; path = ../../audio/utils_neon.S; sourceTree = ""; }; + 501232CF192E60220063A359 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../../common/main.m; sourceTree = ""; }; + 501232D1192E60380063A359 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../../common/RAGameView.m; sourceTree = ""; }; + 501232D3192E60420063A359 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../../common/utility.m; sourceTree = ""; }; + 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; }; - 509FC978183F9F18007A5A30 /* menu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = menu.m; path = iOS/menu.m; sourceTree = SOURCE_ROOT; }; 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - 50DA5C04191EEECE0072AF07 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sinc_neon.S; sourceTree = ""; }; - 50DA5C06191EEED70072AF07 /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = utils_neon.S; sourceTree = ""; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - 50F54A861848F9FC00E19EFD /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_pause.png; sourceTree = ""; }; - 962979F416C43B9500E6DCE0 /* ic_dir.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_dir.png; path = "../../android/phoenix/res/drawable-xhdpi/ic_dir.png"; sourceTree = ""; }; - 962979F516C43B9500E6DCE0 /* ic_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_file.png; path = "../../android/phoenix/res/drawable-xhdpi/ic_file.png"; sourceTree = ""; }; - 96297A0E16C5AEA100E6DCE0 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 96297A2616C82FF100E6DCE0 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../../media/overlays; sourceTree = ""; }; - 96337E81176AC6E5004685F3 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utility.m; sourceTree = ""; }; + 50FE5B1A192E6211000FED1B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../Assets/Default-568h@2x.png"; sourceTree = ""; }; + 50FE5B1B192E6211000FED1B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../../Assets/Default.png; sourceTree = ""; }; + 50FE5B1C192E6211000FED1B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../../Assets/Default@2x.png"; sourceTree = ""; }; + 50FE5B20192E6229000FED1B /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../../Assets/Icon-72.png"; sourceTree = ""; }; + 50FE5B21192E6229000FED1B /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../../Assets/Icon.png; sourceTree = ""; }; + 50FE5B24192E623E000FED1B /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_pause.png; path = ../../Assets/ic_pause.png; sourceTree = ""; }; + 50FE5B26192E624E000FED1B /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = PauseIndicatorView.xib; path = ../../Assets/PauseIndicatorView.xib; sourceTree = ""; }; + 962979F416C43B9500E6DCE0 /* ic_dir.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_dir.png; path = "../../../android/phoenix/res/drawable-xhdpi/ic_dir.png"; sourceTree = ""; }; + 962979F516C43B9500E6DCE0 /* ic_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_file.png; path = "../../../android/phoenix/res/drawable-xhdpi/ic_file.png"; sourceTree = ""; }; + 96297A2616C82FF100E6DCE0 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../../../media/overlays; sourceTree = ""; }; 96366C5416C9AC3300D64A22 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 96366C5816C9ACF500D64A22 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 963C3C31186E3D2600A6EB1E /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = apple_gamecontroller.m; sourceTree = ""; }; 963C3C33186E3DED00A6EB1E /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; - 963F5AC516CC523B009BBD19 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAGameView.m; sourceTree = ""; }; - 9646869417BBBEAE00C5EA69 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = iOS/platform.m; sourceTree = SOURCE_ROOT; }; - 966B9CB816E41E7A005B61E1 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - 966B9CB916E41E7A005B61E1 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; - 966B9CBA16E41E7A005B61E1 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - 966B9CBB16E41E7A005B61E1 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; - 966B9CBC16E41E7A005B61E1 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; - 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PauseIndicatorView.xib; sourceTree = ""; }; - 967894571788EAAE00D6CA69 /* browser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = browser.m; path = iOS/browser.m; sourceTree = SOURCE_ROOT; }; 9678945F1788EBD000D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "iOS/RetroArch-Info.plist"; sourceTree = SOURCE_ROOT; }; 967894621788EBD800D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = iOS/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; 967D647416E6EA04006BA1F2 /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; path = modules; sourceTree = SOURCE_ROOT; }; @@ -81,7 +82,6 @@ 96AFAE3116C1D4EA009DE44C /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 96AFAF4516C1E00A009DE44C /* bitmap.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = bitmap.bin; sourceTree = ""; }; 96AFAF4616C1E00A009DE44C /* bitmap.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; path = bitmap.bmp; sourceTree = ""; }; - D48581DD16F823F9004BEB17 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -107,20 +107,31 @@ /* 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 = ""; + }; 966B9CB716E41E7A005B61E1 /* Assets */ = { isa = PBXGroup; children = ( - 50F54A861848F9FC00E19EFD /* ic_pause.png */, + 50FE5B26192E624E000FED1B /* PauseIndicatorView.xib */, + 50FE5B24192E623E000FED1B /* ic_pause.png */, + 50FE5B20192E6229000FED1B /* Icon-72.png */, + 50FE5B21192E6229000FED1B /* Icon.png */, + 50FE5B1A192E6211000FED1B /* Default-568h@2x.png */, + 50FE5B1B192E6211000FED1B /* Default.png */, + 50FE5B1C192E6211000FED1B /* Default@2x.png */, 967D647416E6EA04006BA1F2 /* modules */, 96297A2616C82FF100E6DCE0 /* overlays */, - 966B9CB816E41E7A005B61E1 /* Default-568h@2x.png */, - 966B9CB916E41E7A005B61E1 /* Default.png */, - 966B9CBA16E41E7A005B61E1 /* Default@2x.png */, 962979F416C43B9500E6DCE0 /* ic_dir.png */, 962979F516C43B9500E6DCE0 /* ic_file.png */, - 966B9CBB16E41E7A005B61E1 /* Icon-72.png */, - 966B9CBC16E41E7A005B61E1 /* Icon.png */, - 966B9CC816E41EC1005B61E1 /* PauseIndicatorView.xib */, ); path = Assets; sourceTree = ""; @@ -128,6 +139,7 @@ 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( + 501232C6192E5F940063A359 /* ios */, 96AFAE3316C1D4EA009DE44C /* common */, 96AFAE9C16C1D976009DE44C /* core */, 966B9CB716E41E7A005B61E1 /* Assets */, @@ -167,13 +179,9 @@ 96AFAE3316C1D4EA009DE44C /* common */ = { isa = PBXGroup; children = ( - 963C3C31186E3D2600A6EB1E /* apple_gamecontroller.m */, - 509FC978183F9F18007A5A30 /* menu.m */, - 9646869417BBBEAE00C5EA69 /* platform.m */, - 967894571788EAAE00D6CA69 /* browser.m */, - 96297A0E16C5AEA100E6DCE0 /* main.m */, - 963F5AC516CC523B009BBD19 /* RAGameView.m */, - 96337E81176AC6E5004685F3 /* utility.m */, + 501232D3192E60420063A359 /* utility.m */, + 501232D1192E60380063A359 /* RAGameView.m */, + 501232CF192E60220063A359 /* main.m */, ); path = common; sourceTree = ""; @@ -201,8 +209,8 @@ 96AFAEE516C1DC73009DE44C /* audio */ = { isa = PBXGroup; children = ( - 50DA5C06191EEED70072AF07 /* utils_neon.S */, - 50DA5C04191EEECE0072AF07 /* sinc_neon.S */, + 501232CD192E5FE30063A359 /* utils_neon.S */, + 501232CB192E5FDC0063A359 /* sinc_neon.S */, ); name = audio; path = ../audio; @@ -229,7 +237,7 @@ D48581DC16F823E2004BEB17 /* griffin */ = { isa = PBXGroup; children = ( - D48581DD16F823F9004BEB17 /* griffin.c */, + 501232C9192E5FC40063A359 /* griffin.c */, ); name = griffin; sourceTree = ""; @@ -285,18 +293,18 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50FE5B23192E6229000FED1B /* Icon.png in Resources */, + 50FE5B1F192E6211000FED1B /* Default@2x.png in Resources */, 96297A2716C82FF100E6DCE0 /* overlays in Resources */, 962979F616C43B9500E6DCE0 /* ic_dir.png in Resources */, + 50FE5B22192E6229000FED1B /* Icon-72.png in Resources */, + 50FE5B27192E624E000FED1B /* PauseIndicatorView.xib in Resources */, 962979F716C43B9500E6DCE0 /* ic_file.png in Resources */, - 966B9CBD16E41E7A005B61E1 /* Default-568h@2x.png in Resources */, - 966B9CBF16E41E7A005B61E1 /* Default.png in Resources */, - 966B9CC116E41E7A005B61E1 /* Default@2x.png in Resources */, - 966B9CC316E41E7A005B61E1 /* Icon-72.png in Resources */, - 966B9CC516E41E7A005B61E1 /* Icon.png in Resources */, - 50F54A871848F9FC00E19EFD /* ic_pause.png in Resources */, - 966B9CCB16E41EC1005B61E1 /* PauseIndicatorView.xib in Resources */, + 50FE5B1D192E6211000FED1B /* Default-568h@2x.png in Resources */, + 50FE5B25192E623E000FED1B /* ic_pause.png in Resources */, 967D647516E6EA04006BA1F2 /* modules in Resources */, 967894631788EBD800D6CA69 /* InfoPlist.strings in Resources */, + 50FE5B1E192E6211000FED1B /* Default.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -307,16 +315,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 963C3C32186E3D2600A6EB1E /* apple_gamecontroller.m in Sources */, - 96297A0F16C5AEA100E6DCE0 /* main.m in Sources */, - 963F5AC816CC523B009BBD19 /* RAGameView.m in Sources */, - 50DA5C07191EEED70072AF07 /* utils_neon.S in Sources */, - D48581DE16F823F9004BEB17 /* griffin.c in Sources */, - 50DA5C05191EEECE0072AF07 /* sinc_neon.S in Sources */, - 96337E82176AC6E5004685F3 /* utility.m in Sources */, - 509FC979183F9F18007A5A30 /* menu.m in Sources */, - 9678945B1788EAAE00D6CA69 /* browser.m in Sources */, - 9646869517BBBEAE00C5EA69 /* platform.m in Sources */, + 501232DA192E606D0063A359 /* menu.m in Sources */, + 501232D4192E60420063A359 /* utility.m in Sources */, + 501232D0192E60220063A359 /* main.m in Sources */, + 501232D8192E605F0063A359 /* browser.m in Sources */, + 501232D6192E60580063A359 /* platform.m in Sources */, + 501232D2192E60380063A359 /* RAGameView.m in Sources */, + 501232CE192E5FE30063A359 /* utils_neon.S in Sources */, + 501232C8192E5FB00063A359 /* apple_gamecontroller.m in Sources */, + 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */, + 501232CA192E5FC40063A359 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/apple/RetroArch_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from apple/RetroArch_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout new file mode 100644 index 0000000000..2bc51df130 --- /dev/null +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 6D7FAF49-495D-480E-B0C9-8C39AC77CE3C + IDESourceControlProjectName + RetroArch_iOS + IDESourceControlProjectOriginsDictionary + + 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A + git://github.com/libretro/common-overlays.git + A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + https://github.com/libretro/RetroArch.git + + IDESourceControlProjectPath + apple/RetroArch_iOS.xcodeproj/project.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A + ../../../media/overlays + A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + ../../.. + + IDESourceControlProjectURL + https://github.com/libretro/RetroArch.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A + IDESourceControlWCCName + overlays + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + A5B07A9E-AFED-41CB-BE4B-7C0CDBC26E8C + IDESourceControlWCCName + retroarch + + + + diff --git a/apple/iOS/bluetooth/btdynamic.c b/apple/iOS/bluetooth/btdynamic.c index 8ac9c78888..1b3c8a1180 100644 --- a/apple/iOS/bluetooth/btdynamic.c +++ b/apple/iOS/bluetooth/btdynamic.c @@ -18,7 +18,7 @@ #include #include -#include "apple/common/rarch_wrapper.h" +#include "../../common/rarch_wrapper.h" #define BUILDING_BTDYNAMIC #include "btdynamic.h" diff --git a/apple/iOS/bluetooth/btdynamic.h b/apple/iOS/bluetooth/btdynamic.h index 7a24cbffe1..4befc15881 100644 --- a/apple/iOS/bluetooth/btdynamic.h +++ b/apple/iOS/bluetooth/btdynamic.h @@ -16,7 +16,7 @@ #ifndef __IOS_RARCH_BTDYNAMIC_H__ #define __IOS_RARCH_BTDYNAMIC_H__ -#include "boolean.h" +#include "../../../boolean.h" #include "btstack/utils.h" #include "btstack/btstack.h" diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c index b1fc84a14c..13878f3a33 100644 --- a/apple/iOS/bluetooth/btpad.c +++ b/apple/iOS/bluetooth/btpad.c @@ -20,7 +20,7 @@ #include #include -#include "apple/common/rarch_wrapper.h" +#include "../../common/rarch_wrapper.h" #include "btdynamic.h" #include "btpad.h" #include "btpad_queue.h" diff --git a/apple/iOS/browser.m b/apple/iOS/browser.m index 7ddbc2a5c8..9eab582b4b 100644 --- a/apple/iOS/browser.m +++ b/apple/iOS/browser.m @@ -16,13 +16,13 @@ #include #include -#include "file_extract.h" +#include "../../file_extract.h" -#import "apple/common/RetroArch_Apple.h" +#import "../common/RetroArch_Apple.h" #import "views.h" -#include "conf/config_file.h" -#include "file.h" +#include "../../conf/config_file.h" +#include "../../file.h" static const void* const associated_module_key = &associated_module_key; diff --git a/apple/iOS/RetroArch-Info.plist b/apple/iOS/iOS/RetroArch-Info.plist similarity index 100% rename from apple/iOS/RetroArch-Info.plist rename to apple/iOS/iOS/RetroArch-Info.plist diff --git a/apple/iOS/en.lproj/InfoPlist.strings b/apple/iOS/iOS/en.lproj/InfoPlist.strings similarity index 100% rename from apple/iOS/en.lproj/InfoPlist.strings rename to apple/iOS/iOS/en.lproj/InfoPlist.strings diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 93a65426a1..6e15fba2bd 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -14,7 +14,7 @@ */ #include -#include "apple/common/RetroArch_Apple.h" +#include "../common/RetroArch_Apple.h" #include "../../input/input_common.h" #include "../../input/apple_input.h" #include "menu.h" diff --git a/apple/iOS/modules/.empty b/apple/iOS/modules/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 782188d892..d367e310dc 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -20,7 +20,7 @@ #include "../../input/apple_input.h" #include "../../settings_data.h" -#include "apple/common/apple_gamecontroller.h" +#include "../common/apple_gamecontroller.h" #include "menu.h" #import "views.h" @@ -28,7 +28,7 @@ #include "bluetooth/btdynamic.h" #include "bluetooth/btpad.h" -#include "file.h" +#include "../../file.h" apple_frontend_settings_t apple_frontend_settings; diff --git a/apple/iOS/views.h b/apple/iOS/views.h index 6f24cbde25..a649aef615 100644 --- a/apple/iOS/views.h +++ b/apple/iOS/views.h @@ -17,7 +17,7 @@ #define _RARCH_APPLE_VIEWS_H #include -#include "frontend/info/core_info.h" +#include "../../frontend/info/core_info.h" #include "menu.h" diff --git a/apple/script/build b/apple/script/build index 15d48e7060..a5aa9abfa2 100755 --- a/apple/script/build +++ b/apple/script/build @@ -19,7 +19,7 @@ if [ -z "$NOCODESIGN" ] ; then xcodebuild -verbose -sdk iphoneos -configuration Release CODE_SIGN_IDENTITY="${CODE_SIGN_IDENTITY}" PROVISIONING_PROFILE="$PROVISION_UUID" -project $PROJECT_NAME echo "CODESIGNING DYNAMIC LIBRARIES AND BUILDING IPA" - codesign -fs "$CODE_SIGN_IDENTITY" $BUILD_PATH/RetroArch.app/modules/*.dylib + codesign -fs "$CODE_SIGN_IDENTITY" $BUILD_PATH/RetroArch.app/iOS/modules/*.dylib xcrun -sdk iphoneos PackageApplication "$BUILD_PATH/RetroArch.app" -o "$BUILD_PATH/RetroArch.ipa" --sign "$CODE_SIGN_IDENTITY" --embed "$BUILD_PATH/RetroArch.app/embedded.mobileprovision" else diff --git a/audio/coreaudio.c b/audio/coreaudio.c index b75627d93c..c6420c3d31 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -15,9 +15,9 @@ */ -#include "driver.h" -#include "general.h" -#include "fifo_buffer.h" +#include "../driver.h" +#include "../general.h" +#include "../fifo_buffer.h" #include #include "../boolean.h" #include