Merge branch 'develop'

Author: JoeMatt

.codiumignore

@@ -0,0 +1,29 @@
+# Dot files
+.bundle
+.cursorignore
+.github
+.gitignore
+.qodo
+.ruby-version
+.vscode
+.vscodeignore
+
+# Directories
+CoreRetro/
+Cores/
+EmuSkinsApp/
+External/
+MoltenVK/
+Provenance Mini*/
+Provenance Mini Watch App/
+Provenance Mini Watch AppTests/
+Provenance Mini Watch AppUITests/
+Provenance Tests/
+Provenance VR/
+ScadeProject/
+Scripts/
+Stencils/
+UITesting/
+fastlane/
+iCloudBrowser/
+modules/

.github/FUNDING.yml

@@ -3,6 +3,7 @@
 github: [JoeMatt]
 patreon: provenance
 open_collective: provenanceemu
+buy_me_a_coffee: joemattiello
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

.gitignore

@@ -124,4 +124,6 @@ Cores/PPSSPP/lib/
 build
 /PVLookup/Sources/ShiraGame/Resources/shiragame.sqlite3
 
-.sentryclirc
+.sentryclirc
+*.code-workspace
+/Cores/Dolphin/venv

.gitmodules

@@ -27,7 +27,7 @@
 	url = https://github.com/flyinghead/flycast.git
 [submodule "Cores/Dolphin/dolphin-ios"]
 	path = Cores/Dolphin/dolphin-ios
-	url = https://github.com/OatmealDome/dolphin.git
+	url = https://JoeMatt@github.com/Provenance-Emu/dolphin-ios-jitless.git
 [submodule "Cores/DuckStation/duckstation"]
 	path = Cores/DuckStation/duckstation
 	url = https://github.com/stenzek/duckstation.git
@@ -175,6 +175,9 @@
 [submodule "Cores/emuThree/cmake/zstd"]
 	path = Cores/emuThree/cmake/zstd
 	url = https://github.com/facebook/zstd.git
+[submodule "Cores/Citra/cmake/zstd"]
+	path = Cores/Citra/cmake/zstd
+	url = https://github.com/facebook/zstd.git
 [submodule "Cores/JollyGoodEmulation"]
 	path = Cores/JollyGoodEmulation
 	url = https://JoeMatt@github.com/Provenance-Emu/JollyGoodEmulation.git
@@ -190,3 +193,6 @@
 [submodule "Cores/Citra/emuThreeDS"]
 	path = Cores/Citra/azahar
 	url = https://github.com/Provenance-Emu/emuThreeDS.git
+[submodule "Cores/Mednafen/ThirdParty/libchdr"]
+	path = Cores/Mednafen/ThirdParty/libchdr
+	url = https://github.com/rtissera/libchdr

Build.xcconfig

@@ -1,11 +1,11 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 3.0.6
-CURRENT_PROJECT_VERSION = 2845
+MARKETING_VERSION = 3.1.1
+CURRENT_PROJECT_VERSION = 2847
 
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1  NONJAILBROKEN=1
-OTHER_CFLAGS = $(inherited) -mcpu=apple-a10 -mtune=apple-a12 -march=armv8-a+simd
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1  NONJAILBROKEN=1 HAVE_DYNAMIC=1 HAVE_CHEEVOS=1
+OTHER_CFLAGS = $(inherited) -mcpu=apple-a10 -mtune=apple-a12 -march=armv8-a+simd+crc+crypto -ffast-math -ftree-vectorize -fno-strict-aliasing -fpermissive -fomit-frame-pointer -fPIC -fmodules -fcxx-modules
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ

Cores/Citra/BuildFlags.xcconfig

@@ -9,6 +9,8 @@ OTHER_CFLAGS = $(inherited) -fpermissive
 OTHER_CFLAGS = $(inherited) -frename-registers
 OTHER_CFLAGS = $(inherited) -fsingle-precision-constant
 OTHER_CFLAGS = $(inherited) -ftree-vectorize
+OTHER_CFLAGS = $(inherited) -fvisibility=hidden
+OTHER_CFLAGS = $(inherited) -fvisibility-inlines-hidden
 // Experimental
 OTHER_CFLAGS = $(inherited) -Wl,--gc-sections
 //OTHER_CFLAGS = $(inherited) -fdata-sections
@@ -20,6 +22,11 @@ OTHER_CFLAGS = $(inherited) -fomit-frame-pointer
 //OTHER_CFLAGS = $(inherited) -fstrict-aliasing
 OTHER_CFLAGS = $(inherited) -funsafe-math-optimizations
 OTHER_CFLAGS = $(inherited) -fvectorize
+OTHER_CFLAGS = $(inherited) -fvisibility=hidden
+OTHER_CFLAGS = $(inherited) -fvisibility-inlines-hidden
+
+// Add linker flags to hide glslang symbols
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,_glslang* -Wl,-unexported_symbol,_SPIRV*
 
 //Note that:
 //The -mcpu flag optimizes specifically for the target CPU architecture
@@ -36,7 +43,7 @@ OTHER_CFLAGS = $(inherited) -mtune=apple-a15  // iPhone 13 series, iPhone 14/14+
 //OTHER_CFLAGS = $(inherited) -mcpu=apple-a17  // iPhone 15 Pro/Pro Max
 //OTHER_CFLAGS = $(inherited) -mcpu=apple-a18    // iPhone 16/16+, iPhone 16 Pro/Pro Max
 //OTHER_CFLAGS = $(inherited) -mtune=apple-a18   // iPhone 16/16+, iPhone 16 Pro/Pro Max
-OTHER_CFLAGS = $(inherited) -march=armv8-a+simd // 34-36fps kirby top screen level 1
+OTHER_CFLAGS = $(inherited) -march=armv8-a+simd+crc+crypto // 34-36fps kirby top screen level 1
 
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_AUDIOTOOLBOX
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) CPPHTTPLIB_OPENSSL_SUPPORT
@@ -50,6 +57,25 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) ENABLE_VULKAN=1
 
 //OTHER_CPPFLAGS = $(inherited) -fmodules -fcxx-modules
 OTHER_LDFLAGS = $(inherited) -ObjC -DIPHONEOS
+// More aggressive symbol hiding for glslang to prevent conflicts with Dolphin
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,_glslang* -Wl,-unexported_symbol,_SPIRV*
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,_TBuiltInResource* -Wl,-unexported_symbol,_EShLanguage*
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,_EShTargetLanguageVersion* -Wl,-unexported_symbol,_TShader*
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,_TProgram* -Wl,-unexported_symbol,_TIntermediate*
+// Hide all C++ mangled glslang symbols
+OTHER_LDFLAGS = $(inherited) -Wl,-unexported_symbol,__ZN7glslang* -Wl,-unexported_symbol,__ZN5SPIRV*
+// Force all symbols to be private by default
+//OTHER_LDFLAGS = $(inherited) -Wl,-private_bundle
+// rpath-based isolation to prevent library interference
+OTHER_LDFLAGS = $(inherited) -Wl,-rpath,@loader_path/PVAzahar
+OTHER_LDFLAGS = $(inherited) -Wl,-rpath,@loader_path/../Frameworks/PVAzahar.framework
+// Prevent implicit dylib loading and force explicit paths
+OTHER_LDFLAGS = $(inherited) -Wl,-no_implicit_dylibs
+// Use two-level namespace to isolate symbols
+//OTHER_LDFLAGS = $(inherited) -Wl,-two_levelnamespace
+// Additional visibility flags to hide symbols
+OTHER_CFLAGS = $(inherited) -fvisibility=hidden -fvisibility-inlines-hidden
+OTHER_CPLUSPLUSFLAGS = $(inherited) -fvisibility=hidden -fvisibility-inlines-hidden
 
 // Swift <--> C++ Interop
 // 1. Include the "MYSWIFTMODULENAME-Swift.h" header from your C++ code. (Where MYSWIFTMODULENAME is your Swift module’s name)

Cores/Citra/PVAzahar.xcodeproj/project.pbxproj

@@ -45116,7 +45116,7 @@
 					"\"$(SRCROOT)/lib/lodepng\"",
 					"\"$(SRCROOT)/lib/dds-ktx\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.5;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/azahar/emuThreeDS/externals",
 					"\"$(SRCROOT)/lib\"",
@@ -45287,7 +45287,7 @@
 					"PB_NO_PACKED_STRUCTS=1",
 					"PB_FIELD_32BIT=1",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -45310,7 +45310,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/PVAzahar/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -45384,7 +45384,7 @@
 					"\"$(SRCROOT)/lib/lodepng\"",
 					"\"$(SRCROOT)/lib/dds-ktx\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.5;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/azahar/emuThreeDS/externals",
 					"\"$(SRCROOT)/lib\"",
@@ -45555,7 +45555,7 @@
 					"PB_NO_PACKED_STRUCTS=1",
 					"PB_FIELD_32BIT=1",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -45578,7 +45578,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/PVAzahar/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.5;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Cores/Citra/PVAzaharCore/Core/PVAzaharCore.swift

@@ -19,6 +19,8 @@ import GameController
 @objcMembers
 public final class PVAzaharCore: PVEmulatorCore {
 
+    public override var supportsSkins: Bool { false }
+
     let _bridge: PVAzaharCoreBridge = .init()
 
     // MARK: Audio

Cores/Citra/PVAzaharCore/Core/PVAzaharCoreBridge.h

@@ -29,6 +29,7 @@ typedef enum PV3DSButton: NSInteger PV3DSButton;
     int8_t cpuOClock;
     BOOL enableJIT;
     BOOL useNew3DS;
+    BOOL rightEyeDisable;
     BOOL enableLogging;
     BOOL asyncShader;
     BOOL asyncPresent;
@@ -59,6 +60,7 @@ typedef enum PV3DSButton: NSInteger PV3DSButton;
 @property (nonatomic, assign) bool enableJIT;
 @property (nonatomic, assign) bool enableLogging;
 @property (nonatomic, assign) bool useNew3DS;
+@property (nonatomic, assign) bool rightEyeDisable;
 @property (nonatomic, assign) bool asyncShader;
 @property (nonatomic, assign) bool asyncPresent;
 @property (nonatomic, assign) int8_t shaderType;

Cores/Citra/PVAzaharCore/Core/PVAzaharCoreBridge.mm

@@ -126,6 +126,7 @@ - (void)setOptionValues {
     [[NSUserDefaults standardUserDefaults] setBool:self.enableJIT forKey:@"use_cpu_jit"];
     [[NSUserDefaults standardUserDefaults] setBool:self.enableLogging forKey:@"enable_logging"];
     [[NSUserDefaults standardUserDefaults] setBool:self.useNew3DS forKey:@"is_new_3ds"];
+    [[NSUserDefaults standardUserDefaults] setBool:self.rightEyeDisable forKey:@"disable_right_eye_render"];
     [[NSUserDefaults standardUserDefaults] setBool:self.enableVSync forKey:@"use_vsync_new"];
     [[NSUserDefaults standardUserDefaults] setBool:self.enableShaderAccurate forKey:@"shaders_accurate_mul"];
     [[NSUserDefaults standardUserDefaults] setBool:self.enableShaderJIT forKey:@"use_shader_jit"];