diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 2593bfb4d3..dfeb868b6f 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -16,28 +16,25 @@ 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 */; }; - 503AEB47196C0BF9006C76FB /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB46196C0BF9006C76FB /* Default@2x.png */; }; - 503AEB4F196C0C22006C76FB /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB48196C0C22006C76FB /* Default-568h@2x.png */; }; - 503AEB50196C0C22006C76FB /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB49196C0C22006C76FB /* Default.png */; }; - 503AEB51196C0C22006C76FB /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB4A196C0C22006C76FB /* Default@2x.png */; }; - 503AEB52196C0C22006C76FB /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB4B196C0C22006C76FB /* ic_pause.png */; }; - 503AEB53196C0C22006C76FB /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB4C196C0C22006C76FB /* Icon-72.png */; }; - 503AEB54196C0C22006C76FB /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB4D196C0C22006C76FB /* Icon.png */; }; - 503AEB55196C0C22006C76FB /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB4E196C0C22006C76FB /* PauseIndicatorView.xib */; }; - 503AEB58196C0C4A006C76FB /* ic_dir.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB56196C0C4A006C76FB /* ic_dir.png */; }; - 503AEB59196C0C4A006C76FB /* ic_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 503AEB57196C0C4A006C76FB /* ic_file.png */; }; 5073C589196C0BA40026E146 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5073C586196C0BA40026E146 /* main.m */; }; 5073C58A196C0BA40026E146 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5073C587196C0BA40026E146 /* RAGameView.m */; }; 5073C58B196C0BA40026E146 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 5073C588196C0BA40026E146 /* utility.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 */; }; - 96297A2716C82FF100E6DCE0 /* overlays in Resources */ = {isa = PBXBuildFile; fileRef = 96297A2616C82FF100E6DCE0 /* overlays */; }; + 83D632DF19ECFCC4009E3161 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632D819ECFCC4009E3161 /* Default-568h@2x.png */; }; + 83D632E019ECFCC4009E3161 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632D919ECFCC4009E3161 /* Default.png */; }; + 83D632E119ECFCC4009E3161 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DA19ECFCC4009E3161 /* Default@2x.png */; }; + 83D632E219ECFCC4009E3161 /* ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DB19ECFCC4009E3161 /* ic_pause.png */; }; + 83D632E319ECFCC4009E3161 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DC19ECFCC4009E3161 /* Icon-72.png */; }; + 83D632E419ECFCC4009E3161 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DD19ECFCC4009E3161 /* Icon.png */; }; + 83D632E519ECFCC4009E3161 /* PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */; }; + 83D6361719ECFE2F009E3161 /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 83D6361619ECFE2F009E3161 /* modules */; }; + 83D6361919ECFE40009E3161 /* overlays in Resources */ = {isa = PBXBuildFile; fileRef = 83D6361819ECFE40009E3161 /* overlays */; }; 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, ); }; }; 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 */; }; 96AFAE2C16C1D4EA009DE44C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2B16C1D4EA009DE44C /* Foundation.framework */; }; 96AFAE2E16C1D4EA009DE44C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAE2D16C1D4EA009DE44C /* CoreGraphics.framework */; }; @@ -55,29 +52,26 @@ 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; }; - 503AEB46196C0BF9006C76FB /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../../Assets/Default@2x.png"; sourceTree = ""; }; - 503AEB48196C0C22006C76FB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../Assets/Default-568h@2x.png"; sourceTree = ""; }; - 503AEB49196C0C22006C76FB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../../Assets/Default.png; sourceTree = ""; }; - 503AEB4A196C0C22006C76FB /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../../Assets/Default@2x.png"; sourceTree = ""; }; - 503AEB4B196C0C22006C76FB /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_pause.png; path = ../../Assets/ic_pause.png; sourceTree = ""; }; - 503AEB4C196C0C22006C76FB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../../Assets/Icon-72.png"; sourceTree = ""; }; - 503AEB4D196C0C22006C76FB /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../../Assets/Icon.png; sourceTree = ""; }; - 503AEB4E196C0C22006C76FB /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = PauseIndicatorView.xib; path = ../../Assets/PauseIndicatorView.xib; sourceTree = ""; }; - 503AEB56196C0C4A006C76FB /* ic_dir.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_dir.png; path = "../../../android/phoenix/res/drawable-xhdpi/ic_dir.png"; sourceTree = ""; }; - 503AEB57196C0C4A006C76FB /* ic_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_file.png; path = "../../../android/phoenix/res/drawable-xhdpi/ic_file.png"; sourceTree = ""; }; 5073C586196C0BA40026E146 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../common/main.m; sourceTree = SOURCE_ROOT; }; 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; }; 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/resamplers/cc_resampler_neon.S; sourceTree = ""; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; - 96297A2616C82FF100E6DCE0 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../../../media/overlays; sourceTree = ""; }; + 83D632D819ECFCC4009E3161 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 83D632D919ECFCC4009E3161 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 83D632DA19ECFCC4009E3161 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 83D632DB19ECFCC4009E3161 /* ic_pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_pause.png; sourceTree = ""; }; + 83D632DC19ECFCC4009E3161 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; + 83D632DD19ECFCC4009E3161 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; + 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PauseIndicatorView.xib; sourceTree = ""; }; + 83D6361619ECFE2F009E3161 /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; name = modules; path = ../modules; sourceTree = ""; }; + 83D6361819ECFE40009E3161 /* 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; }; 963C3C33186E3DED00A6EB1E /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; 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; }; 96AFAE2516C1D4EA009DE44C /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96AFAE2916C1D4EA009DE44C /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 96AFAE2B16C1D4EA009DE44C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -122,33 +116,31 @@ name = ios; sourceTree = ""; }; - 966B9CB716E41E7A005B61E1 /* Assets */ = { + 83D632D719ECFCC4009E3161 /* Assets */ = { isa = PBXGroup; children = ( - 503AEB56196C0C4A006C76FB /* ic_dir.png */, - 503AEB57196C0C4A006C76FB /* ic_file.png */, - 503AEB48196C0C22006C76FB /* Default-568h@2x.png */, - 503AEB49196C0C22006C76FB /* Default.png */, - 503AEB4A196C0C22006C76FB /* Default@2x.png */, - 503AEB4B196C0C22006C76FB /* ic_pause.png */, - 503AEB4C196C0C22006C76FB /* Icon-72.png */, - 503AEB4D196C0C22006C76FB /* Icon.png */, - 503AEB4E196C0C22006C76FB /* PauseIndicatorView.xib */, - 503AEB46196C0BF9006C76FB /* Default@2x.png */, - 967D647416E6EA04006BA1F2 /* modules */, - 96297A2616C82FF100E6DCE0 /* overlays */, + 83D6361819ECFE40009E3161 /* overlays */, + 83D6361619ECFE2F009E3161 /* modules */, + 83D632D819ECFCC4009E3161 /* Default-568h@2x.png */, + 83D632D919ECFCC4009E3161 /* Default.png */, + 83D632DA19ECFCC4009E3161 /* Default@2x.png */, + 83D632DB19ECFCC4009E3161 /* ic_pause.png */, + 83D632DC19ECFCC4009E3161 /* Icon-72.png */, + 83D632DD19ECFCC4009E3161 /* Icon.png */, + 83D632DE19ECFCC4009E3161 /* PauseIndicatorView.xib */, ); - path = Assets; + name = Assets; + path = ../Assets; sourceTree = ""; }; 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( + 83D632D719ECFCC4009E3161 /* Assets */, 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */, 501232C6192E5F940063A359 /* ios */, 96AFAE3316C1D4EA009DE44C /* common */, 96AFAE9C16C1D976009DE44C /* core */, - 966B9CB716E41E7A005B61E1 /* Assets */, 96AFAE2816C1D4EA009DE44C /* Frameworks */, 96AFAE2616C1D4EA009DE44C /* Products */, 96AFAE3416C1D4EA009DE44C /* Supporting Files */, @@ -301,19 +293,16 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 503AEB47196C0BF9006C76FB /* Default@2x.png in Resources */, - 503AEB59196C0C4A006C76FB /* ic_file.png in Resources */, - 503AEB50196C0C22006C76FB /* Default.png in Resources */, - 503AEB51196C0C22006C76FB /* Default@2x.png in Resources */, - 503AEB55196C0C22006C76FB /* PauseIndicatorView.xib in Resources */, - 503AEB58196C0C4A006C76FB /* ic_dir.png in Resources */, - 96297A2716C82FF100E6DCE0 /* overlays in Resources */, - 503AEB53196C0C22006C76FB /* Icon-72.png in Resources */, - 503AEB54196C0C22006C76FB /* Icon.png in Resources */, - 503AEB4F196C0C22006C76FB /* Default-568h@2x.png in Resources */, - 967D647516E6EA04006BA1F2 /* modules in Resources */, - 503AEB52196C0C22006C76FB /* ic_pause.png in Resources */, + 83D632E219ECFCC4009E3161 /* ic_pause.png in Resources */, + 83D6361919ECFE40009E3161 /* overlays in Resources */, + 83D632E119ECFCC4009E3161 /* Default@2x.png in Resources */, 967894631788EBD800D6CA69 /* InfoPlist.strings in Resources */, + 83D6361719ECFE2F009E3161 /* modules in Resources */, + 83D632E019ECFCC4009E3161 /* Default.png in Resources */, + 83D632DF19ECFCC4009E3161 /* Default-568h@2x.png in Resources */, + 83D632E519ECFCC4009E3161 /* PauseIndicatorView.xib in Resources */, + 83D632E419ECFCC4009E3161 /* Icon.png in Resources */, + 83D632E319ECFCC4009E3161 /* Icon-72.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -509,6 +498,7 @@ "-DHAVE_LAKKA", "-DHAVE_GLUI", "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", ); PRODUCT_NAME = "$(TARGET_NAME)"; VALID_ARCHS = "armv7 armv7s"; @@ -564,6 +554,7 @@ "-DHAVE_LAKKA", "-DHAVE_GLUI", "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", ); "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", @@ -596,6 +587,7 @@ "-DHAVE_LAKKA", "-DHAVE_GLUI", "-DHAVE_XMB", + "-D_LZMA_UINT32_IS_ULONG", ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; 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 96f4777dbe..f3d572a2fc 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 @@ -36,14 +36,6 @@ C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 IDESourceControlProjectWCConfigurations - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 76200F0D6584D865E96F58DE862E738E88B23A3C - IDESourceControlWCCName - - IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git diff --git a/apple/script/build.config b/apple/script/build.config index 0e8a862b66..182d75388d 100644 --- a/apple/script/build.config +++ b/apple/script/build.config @@ -1,3 +1,3 @@ CODE_SIGN_IDENTITY="iPhone Developer" PROVISIONING="distribution.mobileprovision" -BUILD_PATH="$PWD/build/Release-iphoneos" +BUILD_PATH="$PWD/iOS/build/Release-iphoneos"