From a55a159fb90340b31f2abfcf4ef13e183ffafaf2 Mon Sep 17 00:00:00 2001 From: Yoshi Sugawara Date: Mon, 2 Sep 2019 01:16:44 -1000 Subject: [PATCH] (tvOS) Cores are now compiled using tvOS SDK and reside in a separate directory - required for iOS 13 support. Updated code sign script to handle tvOS cores --- .gitignore | 1 + pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj | 13 ++++++++----- pkg/apple/code-sign-cores.sh | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index eafc1d0862..92f9d0c2ef 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,7 @@ wiiu/wut/elf2rpl/elf2rpl pkg/apple/iOS/build/ pkg/apple/build/ +pkg/apple/tvOS/modules/ ui/drivers/qt/moc_* ui/drivers/moc_* diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj index e60dcf6119..da1f9d96f4 100644 --- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 926C77EB21FD20C400103EDE /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 926C77EF21FD263800103EDE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 926C77EE21FD263800103EDE /* AudioToolbox.framework */; }; 926C77F121FD26E800103EDE /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 926C77F021FD26E800103EDE /* GameController.framework */; }; - 927BD1A42203DA3A00ECF6C9 /* iOS/modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* iOS/modules */; }; 929784502200EEE400989A60 /* iOS/Resources/Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69D31DE31A547EC800EF4C92 /* iOS/Resources/Media.xcassets */; }; 92CC05A221FE3C1700FF79F0 /* GCDWebServerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 92CC058221FE3C1700FF79F0 /* GCDWebServerResponse.m */; }; 92CC05A321FE3C1700FF79F0 /* GCDWebServerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 92CC058221FE3C1700FF79F0 /* GCDWebServerResponse.m */; }; @@ -71,6 +70,7 @@ 92CC05C321FE3C6D00FF79F0 /* WebServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 92CC05C121FE3C6D00FF79F0 /* WebServer.m */; }; 92CC05C521FEDC9F00FF79F0 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92CC05C421FEDC9F00FF79F0 /* CFNetwork.framework */; }; 92CC05C721FEDD0B00FF79F0 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */; }; + 92E5DCD4231A5786006491BF /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 92E5DCD3231A5786006491BF /* modules */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -130,6 +130,7 @@ 92CC05C121FE3C6D00FF79F0 /* WebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebServer.m; sourceTree = ""; }; 92CC05C421FEDC9F00FF79F0 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; + 92E5DCD3231A5786006491BF /* modules */ = {isa = PBXFileReference; lastKnownFileType = folder; path = modules; 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; }; @@ -193,6 +194,7 @@ 926C77D821FD1E6500103EDE /* tvOS */ = { isa = PBXGroup; children = ( + 92E5DCD3231A5786006491BF /* modules */, 926C77E221FD1E6700103EDE /* Assets.xcassets */, 926C77E421FD1E6700103EDE /* Info.plist */, ); @@ -411,6 +413,7 @@ }; 926C77D621FD1E6500103EDE = { CreatedOnToolsVersion = 10.1; + DevelopmentTeam = R72X3BF4KE; ProvisioningStyle = Automatic; }; }; @@ -454,8 +457,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 927BD1A42203DA3A00ECF6C9 /* iOS/modules in Resources */, 92CC05BD21FE3C1700FF79F0 /* GCDWebUploader.bundle in Resources */, + 92E5DCD4231A5786006491BF /* modules in Resources */, 9222F2002314BA7C0097C0FD /* assets.zip in Resources */, 926C77E321FD1E6700103EDE /* Assets.xcassets in Resources */, ); @@ -492,7 +495,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./code-sign-cores.sh\n"; + shellScript = "./code-sign-cores.sh tvos\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -771,7 +774,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = R72X3BF4KE; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -888,7 +891,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = R72X3BF4KE; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/pkg/apple/code-sign-cores.sh b/pkg/apple/code-sign-cores.sh index 21c36146e9..3fe2435e04 100755 --- a/pkg/apple/code-sign-cores.sh +++ b/pkg/apple/code-sign-cores.sh @@ -16,7 +16,12 @@ fi ITEMS="" -CORES_DIR="${PROJECT_DIR}/iOS/modules" +if [ "$1" = "tvos" ]; then + CORES_DIR="${PROJECT_DIR}/tvOS/modules" +else + CORES_DIR="${PROJECT_DIR}/iOS/modules" +fi + echo "Cores dir: ${CORES_DIR}" if [ -d "$CORES_DIR" ] ; then CORES=$(find "${CORES_DIR}" -depth -type d -name "*.framework" -or -name "*.dylib" -or -name "*.bundle" | sed -e "s/\(.*framework\)/\1\/Versions\/A\//")