Merge branch 'develop-spm-2024' into develop

.github/workflows/build.yml

@@ -16,6 +16,7 @@ concurrency:
 env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  SWIFT_PACKAGE_ALLOW_WRITING_TO_DIRECTORY: ${{ github.workspace }}
 
 jobs:
   build:
@@ -64,7 +65,7 @@ jobs:
           #   sdk: macosx
           #   scheme: Provenance
 
-    runs-on: 'macos-13'
+    runs-on: 'macos-latest'
     timeout-minutes: 300
     steps:
       - name: Checkout code
@@ -80,7 +81,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/[email protected]
         with:
-          xcode-version: '15.1'
+          xcode-version: '16.0'
           # xcode-select-path: /Applications/Xcode_${{ matrix.version }}.app/Contents/Developer
 
       - uses: actions/cache@v3
@@ -97,6 +98,15 @@ jobs:
           key: xcode-cache-deriveddata-${{ github.workflow }}-${{ github.sha }}
           restore-keys: xcode-cache-deriveddata-${{ github.workflow }}-
 
+      - name: Install Swift Package Cache
+        run: |
+          mkdir -p ${{ env.SWIFT_PACKAGE_ALLOW_WRITING_TO_DIRECTORY }}
+          chmod -R u+w ${{ env.SWIFT_PACKAGE_ALLOW_WRITING_TO_DIRECTORY }}
+
+      - name: Activate IDESkipMacroFingerprintValidation
+        run: |
+          defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
+
       # - name: Import Codesign Certificates
       #   uses: apple-actions/import-codesign-certs@v1
       #   with:
@@ -115,11 +125,14 @@ jobs:
           -workspace Provenance.xcworkspace \
           -scheme "${{ matrix.scheme }}" \
           -sdk ${{ matrix.sdk }} \
+          -skipPackagePluginValidation \
+          -skipMacroValidation \
           archive \
           -archivePath ./archive \
           CODE_SIGNING_REQUIRED=NO \
           AD_HOC_CODE_SIGNING_ALLOWED=YES \
           CODE_SIGNING_ALLOWED=NO \
+          SWIFT_PACKAGE_ALLOW_WRITING_TO_DIRECTORY=${{ env.SWIFT_PACKAGE_ALLOW_WRITING_TO_DIRECTORY }} \
           DEVELOPMENT_TEAM=S32Z3HMYVQ \
           ORG_IDENTIFIER=org.provenance-emu \
           | xcpretty && exit ${PIPESTATUS[0]}

.gitignore

@@ -119,3 +119,7 @@ Cores/DuckStation/lib/
 /Cores/Flycast/build
 /Cores/Play/cmake/Source/ui_ios/AltKit/Debug
 /Cores/Play/cmake/Source/ui_ios/Source/libchdr/deps/zlib-1.2.12/Debug
+/Cores/PPSSPP/lib/Release-appletvos
+Cores/PPSSPP/lib/
+build
+/PVLookup/Sources/ShiraGame/Resources/shiragame.sqlite3

.gitmodules

@@ -1,29 +1,26 @@
-[submodule "PVMupen64Plus/mupen64plus-video-gliden64"]
-	path = Cores/Mupen64Plus/Plugins/Video/gliden64
+[submodule "Cores/Mupen64Plus/Sources/Plugins/Video/gliden64"]
+	path = Cores/Mupen64Plus/Sources/Plugins/Video/gliden64
 	url = https://github.com/Provenance-Emu/GLideN64.git
-[submodule "PVMupen64Plus/Plugins/mupen64plus-core"]
-	path = Cores/Mupen64Plus/Plugins/Core
+[submodule "Cores/Mupen64Plus/Sources/Plugins/Core/Core"]
+	path = Cores/Mupen64Plus/Sources/Plugins/Core/Core
 	url = https://github.com/Provenance-Emu/mupen64plus-core.git
-[submodule "PVMupen64Plus/Plugins/mupen64plus-rsp-hle"]
-	path = Cores/Mupen64Plus/Plugins/rsp/hle
+[submodule "Cores/Mupen64Plus/Sources/Plugins/rsp/hle"]
+	path = Cores/Mupen64Plus/Sources/Plugins/rsp/hle
 	url = https://github.com/mupen64plus/mupen64plus-rsp-hle.git
-[submodule "PVMupen64Plus/Plugins/mupen64plus-video-rice"]
-	path = Cores/Mupen64Plus/Plugins/Video/rice
+[submodule "Cores/Mupen64Plus/Sources/Plugins/Video/rice/rice"]
+	path = Cores/Mupen64Plus/Sources/Plugins/Video/rice/rice
 	url = https://github.com/Provenance-Emu/mupen64plus-video-rice.git
-[submodule "PVLibrary/LzmaSDKObjC"]
-	path = PVLibrary/LzmaSDKObjC
-	url = https://github.com/Provenance-Emu/LzmaSDKObjC.git
 [submodule "Cores/VirtualJaguar"]
 	path = Cores/VirtualJaguar
 	url = https://github.com/Provenance-Emu/Core-VirtualJaguar.git
 [submodule "Cores/Reicast/reicast-emulator"]
 	path = Cores/Reicast/reicast-emulator
 	url = https://github.com/Provenance-Emu/reicast-emulator.git
-[submodule "Cores/PokeMini/PokeMini-libretro"]
-	path = Cores/PokeMini/PokeMini-libretro
+[submodule "Cores/PokeMini/Sources/libpokemini/PokeMini-libretro"]
+	path = Cores/PokeMini/Sources/libpokemini/PokeMini-libretro
 	url = https://github.com/libretro/PokeMini.git
-[submodule "Cores/TGBDual/tgbdual-emulator"]
-	path = Cores/TGBDual/tgbdual-emulator
+[submodule "Cores/TGBDual/Sources/libtgbdual/tgbdual-emulator"]
+	path = Cores/TGBDual/Sources/libtgbdual/tgbdual-emulator
 	url = https://github.com/libretro/tgbdual-libretro.git
 [submodule "Cores/Flycast/flycast"]
 	path = Cores/Flycast/flycast
@@ -49,17 +46,14 @@
 [submodule "Cores/4DO"]
 	path = Cores/4DO
 	url = https://github.com/Provenance-Emu/4DO-Core.git
-[submodule "Cores/mGBA/mGBA-Core"]
-	path = Cores/mGBA/mGBA-Core
-	url = https://github.com/Provenance-Emu/mGBA-Core.git
-[submodule "Cores/snesticle/SNESticle"]
-	path = Cores/snesticle/SNESticle
+[submodule "Cores/snesticle/Sources/libSNESticle/SNESticle"]
+	path = Cores/snesticle/Sources/libSNESticle/SNESticle
 	url = https://github.com/Provenance-Emu/SNESticle.git
 [submodule "Cores/sm64ex/sm64ex-ios"]
 	path = Cores/sm64ex/sm64ex-ios
 	url = https://github.com/Provenance-Emu/sm64ex-ios.git
-[submodule "Cores/ProSystem/ProSystem1_3"]
-	path = Cores/ProSystem/ProSystem1_3
+[submodule "Cores/ProSystem/Sources/libprosystem/ProSystem1_3"]
+	path = Cores/ProSystem/Sources/libprosystem/ProSystem1_3
 	url = https://github.com/Provenance-Emu/ProSystem1_3.git
 [submodule "Cores/FinalBurnNeo/FBNeo"]
 	path = Cores/FinalBurnNeo/FBNeo
@@ -109,11 +103,11 @@
 [submodule "Cores/GameMusicEmu/libretro-gme"]
 	path = Cores/GameMusicEmu/libretro-gme
 	url = https://github.com/Provenance-Emu/libretro-gme.git
-[submodule "Cores/VecX/libretro-vecx"]
-	path = Cores/VecX/libretro-vecx
+[submodule "Cores/VecX/Sources/libvecx/libretro-vecx"]
+	path = Cores/VecX/Sources/libvecx/libretro-vecx
 	url = https://github.com/Provenance-Emu/libretro-vecx.git
-[submodule "Cores/Stella/Stella/stella"]
-	path = Cores/Stella/Stella/stella
+[submodule "Cores/Stella/Sources/libstella/stella"]
+	path = Cores/Stella/Sources/libstella/stella
 	url = https://github.com/Provenance-Emu/stella.git
 [submodule "Cores/SameDuck/SameBoy"]
 	path = Cores/SameDuck/SameBoy
@@ -130,11 +124,11 @@
 [submodule "Cores/FreeIntv/FreeIntv"]
 	path = Cores/FreeIntv/FreeIntv
 	url = https://github.com/Provenance-Emu/FreeIntv.git
-[submodule "Cores/Genesis-Plus-GX/PVGenesis/Deps/Genesis-Plus-GX"]
-	path = Cores/Genesis-Plus-GX/PVGenesis/Deps/Genesis-Plus-GX
+[submodule "Cores/Genesis-Plus-GX/Sources/libgenesisplus/Genesis-Plus-GX"]
+	path = Cores/Genesis-Plus-GX/Sources/libgenesisplus/Genesis-Plus-GX
 	url = https://github.com/Provenance-Emu/Genesis-Plus-GX.git
-[submodule "Cores/Mupen64Plus/Plugins/rsp/cxd4"]
-	path = Cores/Mupen64Plus/Plugins/rsp/cxd4
+[submodule "Cores/Mupen64Plus/Sources/Plugins/rsp/cxd4"]
+	path = Cores/Mupen64Plus/Sources/Plugins/rsp/cxd4
 	url = https://github.com/Provenance-Emu/mupen64plus-rsp-cxd4.git
 [submodule "Cores/TIC80/TIC-80"]
 	path = Cores/TIC80/TIC-80
@@ -160,6 +154,9 @@
 [submodule "Cores/snes9x/libretro-snes9x"]
 	path = Cores/snes9x/libretro-snes9x
 	url = https://github.com/libretro/snes9x.git
+[submodule "Cores/emuThree/emuthree"]
+        path = Cores/emuThree/emuthree
+        url = https://github.com/rf2222222/emuThreeDS.git
 [submodule "Cores/supergrafx/libretro-supergrafx"]
 	path = Cores/supergrafx/libretro-supergrafx
 	url = https://github.com/libretro/beetle-supergrafx-libretro.git
@@ -173,11 +170,20 @@
 	path = Cores/Play/Play-
 	url = https://github.com/jpd002/Play-.git
 [submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/UnrarKit"]
-	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/UnrarKit
+	path = CoresRetro/RetroArch/UnrarKit
 	url = https://github.com/abbeycode/UnrarKit.git
-[submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/lhasa"]
-	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/lhasa
+[submodule "CoresRetro/RetroArch/lhasa"]
+	path = CoresRetro/RetroArch/lhasa
 	url = https://github.com/fragglet/lhasa.git
-[submodule "CoresRetro/RetroArch/PVRetroArchCore/Archive/ZipArchive"]
-	path = CoresRetro/RetroArch/PVRetroArchCore/Archive/ZipArchive
+[submodule "Cores/emuThree/cmake/zstd"]
+	path = Cores/emuThree/cmake/zstd
+	url = https://github.com/facebook/zstd.git
+[submodule "Cores/JollyGoodEmulation"]
+	path = Cores/JollyGoodEmulation
+	url = https://[email protected]/Provenance-Emu/JollyGoodEmulation.git
+[submodule "Cores/mGBA/Sources/libmGBA"]
+	path = Cores/mGBA/Sources/libmGBA
+	url = https://github.com/Provenance-Emu/mGBA-Core.git
+[submodule "CoresRetro/RetroArch/ZipArchive"]
+	path = CoresRetro/RetroArch/ZipArchive
 	url = https://github.com/ZipArchive/ZipArchive.git

Build-iOS.xcconfig

@@ -1,6 +1,6 @@
 #include "Build.xcconfig"
 
-IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*] = 14.2
-IPHONEOS_DEPLOYMENT_TARGET = 13.0
+IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*] = 17.0
+IPHONEOS_DEPLOYMENT_TARGET = 17.0
 
 

Build.xcconfig

@@ -2,7 +2,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2.3.0
-CURRENT_PROJECT_VERSION = 2807
+CURRENT_PROJECT_VERSION = 2813
 
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1  NONJAILBROKEN=1
 
@@ -20,6 +20,7 @@ PRODUCT_NAME = $(TARGET_NAME)
 
 _PRODUCT_BUNDLE_IDENTIFIER_ = $(ORG_PREFIX).$(PROJECT_NAME:lower)
 PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower)
+PRODUCT_BUNDLE_IDENTIFIER_LITE = $(ORG_PREFIX).$(PROJECT_NAME:lower).lite
 //PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug
 
 APP_GROUP_IDENTIFIER        = group.$(ORG_PREFIX).$(PROJECT_NAME:lower)