From 7754620cdb0c8a3ec50d20507e1cfdc6f0823f7c Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Sun, 8 Feb 2015 10:36:59 -0800 Subject: [PATCH] Possibly make iOS app build work (no shaders yet) --- .../RetroArch_iOS.xcodeproj/project.pbxproj | 56 ++++++++++++++----- .../xcshareddata/RetroArch_iOS.xccheckout | 46 ++++++++++++++- apple/iOS/modules/.empty | 0 3 files changed, 87 insertions(+), 15 deletions(-) delete mode 100644 apple/iOS/modules/.empty diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 3707ad09f2..3e6d42706a 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -26,7 +26,12 @@ 69D31DE41A547EC800EF4C92 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69D31DE31A547EC800EF4C92 /* Media.xcassets */; }; 83D632E219ECFCC4009E3161 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DB19ECFCC4009E3161 /* ic_pause.png */; }; 83D632E519ECFCC4009E3161 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */; }; - 83EB676019EEAF050096F441 /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* modules */; }; + 84F9A9BC1A87E068003AF12F /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BB1A87E068003AF12F /* assets */; }; + 84F9A9BE1A87E0A2003AF12F /* autoconfig in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BD1A87E0A2003AF12F /* autoconfig */; }; + 84F9A9C01A87E0C6003AF12F /* overlays in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BF1A87E0C6003AF12F /* overlays */; }; + 84F9A9C51A87E1D0003AF12F /* cursors in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C41A87E1D0003AF12F /* cursors */; }; + 84F9A9C71A87E1E8003AF12F /* rdb in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C61A87E1E8003AF12F /* rdb */; }; + 84F9A9C81A87E250003AF12F /* cht in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9C11A87E180003AF12F /* cht */; }; 96366C5516C9AC3300D64A22 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5416C9AC3300D64A22 /* CoreAudio.framework */; }; 96366C5916C9ACF500D64A22 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96366C5816C9ACF500D64A22 /* AudioToolbox.framework */; }; 963C3C34186E3DED00A6EB1E /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -58,7 +63,12 @@ 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 = ""; }; 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PauseIndicatorView.xib; sourceTree = ""; }; - 83EB675F19EEAF050096F441 /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; path = modules; sourceTree = SOURCE_ROOT; }; + 84F9A9BB1A87E068003AF12F /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../../../media/assets; sourceTree = ""; }; + 84F9A9BD1A87E0A2003AF12F /* autoconfig */ = {isa = PBXFileReference; lastKnownFileType = folder; name = autoconfig; path = ../../../media/autoconfig; sourceTree = ""; }; + 84F9A9BF1A87E0C6003AF12F /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../../../media/overlays; sourceTree = ""; }; + 84F9A9C11A87E180003AF12F /* cht */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cht; path = ../../../media/libretrodb/cht; sourceTree = ""; }; + 84F9A9C41A87E1D0003AF12F /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../../../media/libretrodb/cursors; sourceTree = ""; }; + 84F9A9C61A87E1E8003AF12F /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../../../media/libretrodb/rdb; 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; }; 963C3C33186E3DED00A6EB1E /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; @@ -112,7 +122,10 @@ 83D632D719ECFCC4009E3161 /* Assets */ = { isa = PBXGroup; children = ( - 83EB675F19EEAF050096F441 /* modules */, + 84F9A9C31A87E1AA003AF12F /* Database */, + 84F9A9BB1A87E068003AF12F /* assets */, + 84F9A9BD1A87E0A2003AF12F /* autoconfig */, + 84F9A9BF1A87E0C6003AF12F /* overlays */, 83D632DB19ECFCC4009E3161 /* ic_pause.png */, 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */, 69D31DE31A547EC800EF4C92 /* Media.xcassets */, @@ -121,6 +134,16 @@ path = Resources; sourceTree = ""; }; + 84F9A9C31A87E1AA003AF12F /* Database */ = { + isa = PBXGroup; + children = ( + 84F9A9C11A87E180003AF12F /* cht */, + 84F9A9C41A87E1D0003AF12F /* cursors */, + 84F9A9C61A87E1E8003AF12F /* rdb */, + ); + name = Database; + sourceTree = ""; + }; 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( @@ -287,11 +310,16 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 84F9A9C81A87E250003AF12F /* cht in Resources */, 83D632E219ECFCC4009E3161 /* ic_pause.png in Resources */, 967894631788EBD800D6CA69 /* InfoPlist.strings in Resources */, - 83EB676019EEAF050096F441 /* modules in Resources */, + 84F9A9BE1A87E0A2003AF12F /* autoconfig in Resources */, + 84F9A9C51A87E1D0003AF12F /* cursors in Resources */, + 84F9A9BC1A87E068003AF12F /* assets in Resources */, + 84F9A9C01A87E0C6003AF12F /* overlays in Resources */, 69D31DE41A547EC800EF4C92 /* Media.xcassets in Resources */, 83D632E519ECFCC4009E3161 /* PauseIndicatorView.xib in Resources */, + 84F9A9C71A87E1E8003AF12F /* rdb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -357,8 +385,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", "-DHAVE_LOCATION", @@ -412,8 +440,8 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", "-DHAVE_LOCATION", @@ -471,8 +499,8 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", "-DHAVE_LOCATION", @@ -534,8 +562,8 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", "-DHAVE_LOCATION", @@ -568,8 +596,8 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", "-DHAVE_CAMERA", "-DHAVE_GRIFFIN", "-DHAVE_LOCATION", 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 index c1e2335cc9..480a41060d 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout @@ -10,8 +10,14 @@ RetroArch_iOS IDESourceControlProjectOriginsDictionary + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + https://github.com/libretro/retroarch-joypad-autoconfig.git 76200F0D6584D865E96F58DE862E738E88B23A3C https://github.com/libretro/libretro-super.git + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + https://github.com/libretro/retroarch-assets.git + C3AEE01BDA902108663DB5DB9CD7916436919463 + https://github.com/libretro/libretro-database.git C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 https://github.com/libretro/RetroArch.git EF363D58F01B3FB341FA6C851870E60E4F080E97 @@ -21,12 +27,18 @@ apple/iOS/RetroArch_iOS.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + ../../../../media/autoconfig 76200F0D6584D865E96F58DE862E738E88B23A3C ../../../../.. + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + ../../../../media/assets + C3AEE01BDA902108663DB5DB9CD7916436919463 + ../../../../media/libretrodb C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 ../../../.. EF363D58F01B3FB341FA6C851870E60E4F080E97 - ../../../..media/overlays + ../../../../media/overlays IDESourceControlProjectURL https://github.com/libretro/RetroArch.git @@ -44,6 +56,38 @@ IDESourceControlWCCName + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 76200F0D6584D865E96F58DE862E738E88B23A3C + IDESourceControlWCCName + + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + IDESourceControlWCCName + assets + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + IDESourceControlWCCName + autoconfig + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + C3AEE01BDA902108663DB5DB9CD7916436919463 + IDESourceControlWCCName + libretrodb + IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git diff --git a/apple/iOS/modules/.empty b/apple/iOS/modules/.empty deleted file mode 100644 index e69de29bb2..0000000000