From 671771d3cd10feb1b6eb69ed5bd5c26dba9a116a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 25 Feb 2017 02:47:32 +0100 Subject: [PATCH] Update RetroArch iOS 10 solution --- .../RetroArch_iOS10.xcodeproj/project.pbxproj | 61 +++++-------------- 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj index 24ab7ce13c..ff4dde76a7 100644 --- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj @@ -7,10 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 0FDA2A721BE1AFA800F2B5DA /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 0FDA2A731BE1AFA800F2B5DA /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; - 0FDA2A741BE1AFA800F2B5DA /* s16_to_float_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* s16_to_float_neon.S */; }; - 0FDA2A751BE1AFA800F2B5DA /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 0FDA2A761BE1AFA800F2B5DA /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 0FDA2A781BE1AFA800F2B5DA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5040F04F1AE47ED4006F6972 /* libz.dylib */; }; 0FDA2A791BE1AFA800F2B5DA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; @@ -33,14 +30,9 @@ 0FDA2A8B1BE1AFA800F2B5DA /* iOS/Resources/PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DE19ECFCC4009E3161 /* iOS/Resources/PauseIndicatorView.xib */; }; 0FDA2A8C1BE1AFA800F2B5DA /* iOS/modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* iOS/modules */; }; 501232CA192E5FC40063A359 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; - 501232CC192E5FDC0063A359 /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; - 501232CE192E5FE30063A359 /* s16_to_float_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* s16_to_float_neon.S */; }; 501881EC184BAD6D006F665D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881EB184BAD6D006F665D /* AVFoundation.framework */; }; 501881EE184BB54C006F665D /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881ED184BB54C006F665D /* CoreMedia.framework */; }; - 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; - 5037008A1ACA18E400A51A37 /* s16_to_float_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* s16_to_float_neon.S */; }; - 5037008B1ACA18E400A51A37 /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 5037008C1ACA18E400A51A37 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 5037008E1ACA18E400A51A37 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; 503700901ACA18E400A51A37 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696012F119F3389A006A1088 /* CoreText.framework */; }; @@ -64,23 +56,15 @@ 5040F0511AE47EE2006F6972 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5040F04F1AE47ED4006F6972 /* libz.dylib */; }; 5041BAF41A9D40D000A77A33 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; - 507E056B1CE9C67500E023D3 /* float_to_s16_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */; }; - 507E056C1CE9C69300E023D3 /* float_to_s16_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */; }; - 507E056D1CE9C69400E023D3 /* float_to_s16_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */; }; 50C3B1AE1AB1107200F478D3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; 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 */; }; 696012F219F3389A006A1088 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696012F119F3389A006A1088 /* CoreText.framework */; }; 69D31DE41A547EC800EF4C92 /* iOS/Resources/Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69D31DE31A547EC800EF4C92 /* iOS/Resources/Media.xcassets */; }; 83D632E219ECFCC4009E3161 /* iOS/Resources/ic_pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DB19ECFCC4009E3161 /* iOS/Resources/ic_pause.png */; }; 83D632E519ECFCC4009E3161 /* iOS/Resources/PauseIndicatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83D632DE19ECFCC4009E3161 /* iOS/Resources/PauseIndicatorView.xib */; }; 83EB676019EEAF050096F441 /* iOS/modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* iOS/modules */; }; - 9204BE0B1D319EF300BD49DB /* float_to_s16_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */; }; - 9204BE0C1D319EF300BD49DB /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 9204BE0D1D319EF300BD49DB /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; - 9204BE0E1D319EF300BD49DB /* s16_to_float_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* s16_to_float_neon.S */; }; - 9204BE0F1D319EF300BD49DB /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 9204BE101D319EF300BD49DB /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 9204BE121D319EF300BD49DB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5040F04F1AE47ED4006F6972 /* libz.dylib */; }; 9204BE131D319EF300BD49DB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; @@ -116,18 +100,14 @@ 0FDA2A911BE1AFA800F2B5DA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 0FDA2A921BE1AFA800F2B5DA /* RetroArch_iOS9-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RetroArch_iOS9-Info.plist"; path = "/Users/buildbot/buildbot/ios/retroarch/pkg/apple/RetroArch_iOS9-Info.plist"; sourceTree = ""; }; 501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; - 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_resampler_neon.S; path = "../../libretro-common/audio/resampler/drivers/sinc_resampler_neon.S"; sourceTree = SOURCE_ROOT; }; - 501232CD192E5FE30063A359 /* s16_to_float_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = s16_to_float_neon.S; path = "../../libretro-common/audio/conversion/s16_to_float_neon.S"; sourceTree = SOURCE_ROOT; }; 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; }; 503700AD1ACA18E400A51A37 /* RetroArch copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RetroArch copy.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 503700AE1ACA18E400A51A37 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = iOS/Info.plist; sourceTree = SOURCE_ROOT; }; 5040F04F1AE47ED4006F6972 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 50521A431AA23BF500185CC9 /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = SOURCE_ROOT; }; - 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = float_to_s16_neon.S; path = "../../libretro-common/audio/conversion/float_to_s16_neon.S"; sourceTree = SOURCE_ROOT; }; 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 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 = SOURCE_ROOT; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 696012F119F3389A006A1088 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 69D31DE31A547EC800EF4C92 /* iOS/Resources/Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = iOS/Resources/Media.xcassets; sourceTree = SOURCE_ROOT; }; @@ -256,9 +236,7 @@ 96AFAE1A16C1D4EA009DE44C = { isa = PBXGroup; children = ( - 507E056A1CE9C67500E023D3 /* float_to_s16_neon.S */, 83D632D719ECFCC4009E3161 /* Assets */, - 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */, 96AFAE9C16C1D976009DE44C /* core */, 96AFAE2816C1D4EA009DE44C /* Frameworks */, 96AFAE2616C1D4EA009DE44C /* Products */, @@ -323,15 +301,6 @@ name = core; sourceTree = ""; }; - 96AFAEE516C1DC73009DE44C /* audio */ = { - isa = PBXGroup; - children = ( - 501232CD192E5FE30063A359 /* s16_to_float_neon.S */, - ); - name = audio; - path = ../audio; - sourceTree = ""; - }; 96AFAF3116C1E00A009DE44C /* gfx */ = { isa = PBXGroup; children = ( @@ -545,11 +514,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 507E056D1CE9C69400E023D3 /* float_to_s16_neon.S in Sources */, - 0FDA2A721BE1AFA800F2B5DA /* cc_resampler_neon.S in Sources */, 0FDA2A731BE1AFA800F2B5DA /* griffin_objc.m in Sources */, - 0FDA2A741BE1AFA800F2B5DA /* s16_to_float_neon.S in Sources */, - 0FDA2A751BE1AFA800F2B5DA /* sinc_resampler_neon.S in Sources */, 0FDA2A761BE1AFA800F2B5DA /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -558,11 +523,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 507E056C1CE9C69300E023D3 /* float_to_s16_neon.S in Sources */, - 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */, 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */, - 5037008A1ACA18E400A51A37 /* s16_to_float_neon.S in Sources */, - 5037008B1ACA18E400A51A37 /* sinc_resampler_neon.S in Sources */, 5037008C1ACA18E400A51A37 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -571,11 +532,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9204BE0B1D319EF300BD49DB /* float_to_s16_neon.S in Sources */, - 9204BE0C1D319EF300BD49DB /* cc_resampler_neon.S in Sources */, 9204BE0D1D319EF300BD49DB /* griffin_objc.m in Sources */, - 9204BE0E1D319EF300BD49DB /* s16_to_float_neon.S in Sources */, - 9204BE0F1D319EF300BD49DB /* sinc_resampler_neon.S in Sources */, 9204BE101D319EF300BD49DB /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -584,11 +541,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 507E056B1CE9C67500E023D3 /* float_to_s16_neon.S in Sources */, - 50D00E8E19D117C400EBA71E /* cc_resampler_neon.S in Sources */, 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */, - 501232CE192E5FE30063A359 /* s16_to_float_neon.S in Sources */, - 501232CC192E5FDC0063A359 /* sinc_resampler_neon.S in Sources */, 501232CA192E5FC40063A359 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -631,6 +584,7 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -713,6 +667,7 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -765,6 +720,7 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -848,6 +804,7 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -928,6 +885,7 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -977,6 +935,7 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1056,6 +1015,7 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1139,6 +1099,7 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1191,6 +1152,7 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1277,6 +1239,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1348,6 +1311,7 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1422,6 +1386,7 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1505,6 +1470,7 @@ OTHER_CFLAGS = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID", @@ -1557,6 +1523,7 @@ "OTHER_CFLAGS[arch=*]" = ( "-DNS_BLOCK_ASSERTIONS=1", "-DNDEBUG", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_CORETEXT", "-DHAVE_HID",