Merge pull request #2210 from rf2222222/xcode15beta2

XCode15 / iOS17: Add 3DS Support through EmuThreeds / Update Play! PS2 to latest code

.github/workflows/build.yml

@@ -28,20 +28,37 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - Provenance
-          - ProvenanceTV
+          - Provenance-Release
+          - ProvenanceTV-Release
+          - "Provenance-XL Release"
+          - Provenance-UnderDevelopment
         include:
-          - target: Provenance
+          - target: Provenance-Release
             sdk: iphoneos
-            scheme: Provenance
-          - target: ProvenanceTV
+            scheme: Provenance-Release
+            APP_NAME: Provenance
+            IPA_NAME: Provenance
+          - target: ProvenanceTV-Release
             sdk: appletvos
-            scheme: ProvenanceTV
+            scheme: ProvenanceTV-Release
+            APP_NAME: Provenance
+            IPA_NAME: ProvenanceTV
+          - target: "Provenance-XL Release"
+            sdk: iphoneos
+            scheme: "Provenance-XL Release"
+            APP_NAME: Provenance-XL
+            IPA_NAME: Provenance-XL
+          - target: Provenance-UnderDevelopment
+            sdk: iphoneos
+            scheme: Provenance-UnderDevelopment
+            APP_NAME: Provenance-UnderDevelopment
+            IPA_NAME: Provenance-UnderDevelopment
           # - target: macOS
           #   sdk: macosx
           #   scheme: Provenance
 
     runs-on: 'macos-12'
+    timeout-minutes: 300
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -69,7 +86,7 @@ jobs:
 
       - name: Build Provenance
         run: |
-          xcodebuild -workspace Provenance.xcworkspace -scheme ${{ matrix.scheme }} -sdk ${{ matrix.sdk }} archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=S32Z3HMYVQ ORG_IDENTIFIER=org.provenance-emu | xcpretty && exit ${PIPESTATUS[0]}
+          xcodebuild -configuration Release -workspace Provenance.xcworkspace -scheme "${{ matrix.scheme }}" -sdk ${{ matrix.sdk }} archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=S32Z3HMYVQ ORG_IDENTIFIER=org.provenance-emu | xcpretty && exit ${PIPESTATUS[0]}
 
       # - name: Build Provenance
       #   run: |
@@ -80,21 +97,20 @@ jobs:
 
       - name: Fakesign app
         run: |
-          rm -rf archive.xcarchive/Products/Applications/Provenance.app/Frameworks/*.framework/Frameworks/
-          ldid -SProvenance/Provenance.entitlements archive.xcarchive/Products/Applications/Provenance.app/Provenance
+          #rm -rf archive.xcarchive/Products/Applications/${{ matrix.APP_NAME }}.app/Frameworks/*.framework/Frameworks/
+          ldid -SProvenance/Provenance.entitlements archive.xcarchive/Products/Applications/${{ matrix.APP_NAME }}.app/${{ matrix.APP_NAME }}
 
       - name: Convert to IPA
         run: |
           mkdir Payload
-          mkdir Payload/${{ matrix.target }}.app
-          cp -R archive.xcarchive/Products/Applications/Provenance.app/ Payload/${{ matrix.target }}.app/
-          zip -r ${{ matrix.target }}.ipa Payload
+          cp -pR "archive.xcarchive/Products/Applications/${{ matrix.APP_NAME }}.app" "Payload/${{ matrix.IPA_NAME }}.app"
+          zip -r "${{ matrix.IPA_NAME }}.ipa" Payload
 
       - name: Upload Artifact
         uses: actions/[email protected]
         with:
-          name: ${{ matrix.target }}.ipa
-          path: ${{ matrix.target }}.ipa
+          name: "${{ matrix.IPA_NAME }}.ipa"
+          path: "${{ matrix.IPA_NAME }}.ipa"
 
       # - name: Upload IPA to S3
       #   if: ${{ github.branch == 'develop' }}
@@ -113,4 +129,4 @@ jobs:
     #     group: Testers
     #     file: Provenance.ipa
     #     notifyTesters: true
-    #     debug: false
+    #     debug: false

.gitmodules

@@ -31,9 +31,6 @@
 [submodule "Cores/Dolphin/dolphin-ios"]
 	path = Cores/Dolphin/dolphin-ios
 	url = https://github.com/OatmealDome/dolphin.git
-[submodule "Cores/Play/Play-"]
-	path = Cores/Play/Play-
-	url = https://github.com/Provenance-Emu/Play-.git
 [submodule "Cores/DuckStation/duckstation"]
 	path = Cores/DuckStation/duckstation
 	url = https://github.com/stenzek/duckstation.git
@@ -175,3 +172,21 @@
 [submodule "Cores/PPSSPP/libretro_ppsspp"]
 	path = Cores/PPSSPP/libretro_ppsspp
 	url = https://github.com/hrydgard/ppsspp.git
+[submodule "Cores/Play/Play-"]
+	path = Cores/Play/Play-
+	url = https://github.com/jpd002/Play-.git
+[submodule "Cores/emuThree/emuthree"]
+	path = Cores/emuThree/emuthree
+	url = https://github.com/emuPlace/emuThreeDS.git
+[submodule "Cores/emuThree/cmake/zstd"]
+	path = Cores/emuThree/cmake/zstd
+	url = https://github.com/facebook/zstd.git
+[submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/UnrarKit"]
+	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/UnrarKit
+	url = https://github.com/abbeycode/UnrarKit.git
+[submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/lhasa"]
+	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/lhasa
+	url = https://github.com/fragglet/lhasa.git
+[submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/ZipArchive"]
+	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/ZipArchive
+	url = https://github.com/ZipArchive/ZipArchive.git

Cores/Atari800/PVAtari800.xcodeproj/project.pbxproj

@@ -587,6 +587,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SYMROOT = "${SRCROOT}/build";
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
@@ -635,6 +636,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SYMROOT = "${SRCROOT}/build";
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
@@ -682,6 +684,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				SDKROOT = iphoneos;
+				SYMROOT = "${SRCROOT}/build";
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Archive;