Build: XCode16 beta2 compile

Provenance-Emu · Jul 4, 2024 · 88acab9 · 88acab9
1 parent 470e3af
commit 88acab9
Show file tree

Hide file tree

Showing 42 changed files with 9,906 additions and 2,087 deletions.
diff --git a/Cores/BeetlePSX/BuildFlags.xcconfig b/Cores/BeetlePSX/BuildFlags.xcconfig
@@ -18,12 +18,12 @@ GL_APIENTRYP=GLAPIENTRY*
 // EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(inherited)
 
     // Device
-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 NEON=1 IOS=1 HAVE_OPENGLES3=1
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 IOS=1 HAVE_OPENGLES3=1 //NEON=1
 
 // TODO: Why does this result in some missing symbols?
 // HAVE_OPENGLES_3_1=1
 
-OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -mfpu=neon -D__VEC4_OPT -D__NEON_OPT 
+OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited)
 
 // Simulator

diff --git a/Cores/Mednafen/Config.xcconfig b/Cores/Mednafen/Config.xcconfig
@@ -20,7 +20,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_LROUND HAVE_MKDIR HAVE_PTHREAD_
 OTHER_CFLAGS = $(inherited) -funroll-loops -fPIC -Wall -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-uninitialized -Wno-strict-aliasing -Wno-aggressive-loop-optimizations -fno-fast-math -fomit-frame-pointer -fsigned-char -Wshadow -Wempty-body -Wignored-qualifiers -Wvla -Wvariadic-macros -Wdisabled-optimization -DMEDNAFEN_VERSION=\"1.27.1\" -DPACKAGE=\"mednafen\" -DICONV_CONST=
 OTHER_CFLAGS[arch=armv7] = -mfpu=neon $(inherited)
 OTHER_CFLAGS[arch=armv7s] = -mfpu=neon $(inherited)
-OTHER_CFLAGS[arch=arm64] = -mfpu=neon $(inherited)
+//OTHER_CFLAGS[arch=arm64] = -mfpu=neon $(inherited)
 OTHER_CFLAGS[arch=x86_64] = $(inherited)
 
 // MacOS Catalyst

diff --git a/Cores/Mu/PVMu.xcodeproj/project.pbxproj b/Cores/Mu/PVMu.xcodeproj/project.pbxproj
@@ -1807,8 +1807,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",
-					"-mno-thumb",
-					"-mfpu=neon",
 					"-fno-operator-names",
 					"-fno-rtti",
 					"-ffast-math",
@@ -2099,8 +2097,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
-					"-mno-thumb",
-					"-mfpu=neon",
 					"-fno-operator-names",
 					"-fno-rtti",
 					"-ffast-math",

diff --git a/Cores/Mupen64Plus-NX/Config.xcconfig b/Cores/Mupen64Plus-NX/Config.xcconfig
@@ -12,7 +12,7 @@ OTHER_LDFLAGS= $(inherited)
 // -EGL < android
 
 // DEFINES by Arch's
-GCC_PREPROCESSOR_DEFINITIONS[arch=*] = $(inherited) __LIBRETRO__ IOS MUPENPLUSAPI=1 TXFILTER_LIB=1 GL_SILENCE_DEPRECATION=1 VFP_HARD=1 NO_ASM MUPENPLUSAPI=1 TXFILTER_LIB=1 M64P_PLUGIN_PROTOTYPES=1 PROVENANCE GCC __LIBRETRO__=1 HAVE_OPENGLES=1 HAVE_OPENGLES3=1 GLES3=1 HAVE_ARM_NEON_ASM_OPTIMIZATIONS=1 HAVE_PARALLEL_RSP=1 PARALLEL_INTEGRATION=1 HAVE_THR_AL=1 HAVE_PARALLEL_RDP=0 PNG_ARM_NEON_OPT=0 JIT_ENABLED=1 HAVE_NEON=1 HAVE_THREADS=1 GCC=1
+GCC_PREPROCESSOR_DEFINITIONS[arch=*] = $(inherited) __LIBRETRO__ IOS MUPENPLUSAPI=1 TXFILTER_LIB=1 GL_SILENCE_DEPRECATION=1 VFP_HARD=1 NO_ASM MUPENPLUSAPI=1 TXFILTER_LIB=1 M64P_PLUGIN_PROTOTYPES=1 PROVENANCE GCC __LIBRETRO__=1 HAVE_OPENGLES=1 HAVE_OPENGLES3=1 GLES3=1 HAVE_PARALLEL_RSP=1 PARALLEL_INTEGRATION=1 HAVE_THR_AL=1 HAVE_PARALLEL_RDP=0 PNG_ARM_NEON_OPT=0 JIT_ENABLED=1 HAVE_THREADS=1 GCC=1 // HAVE_ARM_NEON_ASM_OPTIMIZATIONS=1 HAVE_NEON=1
 // strdup=_strdup strlcpy=_strlcpy __unix__
 GCC_PREPROCESSOR_DEFINITIONS[arch=arm64] = $(inherited) NEW_DYNAREC=4 DYNAREC=3
 GCC_PREPROCESSOR_DEFINITIONS[arch=armv7s] = $(inherited) NEW_DYNAREC=3
@@ -21,27 +21,27 @@ GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64] = $(inherited) NEW_DYNAREC=2 NO_ASM=0
 
 // MacOS Catalyst
 GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) OS_MAC_OS_X=1 SDL_VIDEO_OPENGL=1
-OTHER_CFLAGS[sdk=macosx*] = $(inherited) -fno-strict-aliasing -fvisibility=hidden -DGCC -pthread -fPIC -D__unix__ -D__VEC4_OPT -D__NEON_OPT -DX86_ASM
+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -fno-strict-aliasing -fvisibility=hidden -DGCC -pthread -fPIC -D__unix__ -D__VEC4_OPT -DX86_ASM //-D__NEON_OPT
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(inherited) 3DMathNeon.cpp gSPNeon.cpp RSP_LoadMatrixNeon.cpp CRC_OPT_NEON.cpp
 
 // iPhone
-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
-OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -DOS_IOS -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 //NEON=1
+OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -DOS_IOS -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited) 3DMath.cpp
 
 // Simulator
-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 //NEON=1 SDL_VIDEO_OPENGL_ES2=1
 OTHER_CFLAGS[sdk=iphonesimulator*] = $(inherited) -DOS_IOS
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(inherited) sinc_resampler_neon.S s16_to_float_neon.c s16_to_float_neon.S float_to_s16_neon.c float_to_s16_neon.S 3DMathNeon.cpp gSPNeon.cpp
 
 // tvOS Device
-GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
-OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DOS_IOS -mfpu=neon  -D__VEC4_OPT
+GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 //NEON=1
+OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DOS_IOS -D__VEC4_OPT // -mfpu=neon
 EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*] = $(inherited) 3DMath.cpp
 
 // tvOS Simulator
-GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
-OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -DOS_IOS 
+GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 // NEON=1
+OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -DOS_IOS
 
 
 

diff --git a/Cores/PPSSPP/BuildFlags.xcconfig b/Cores/PPSSPP/BuildFlags.xcconfig
@@ -18,7 +18,7 @@
 //OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DDRC_SH2 -D_USE_CZ80
 //OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -D_USE_CZ80
 //OTHER_CFLAGS = $(inherited) -DXXH_VECTOR=XXH_SCALAR -DMASKED_PSP_MEMORY=TRUE
-OTHER_CFLAGS = $(inherited) -mno-thumb -mfpu=neon -fno-operator-names -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fno-operator-names -fobjc-arc -fsingle-precision-constant -fmodules -fcxx-modules -fomit-frame-pointer -fvisibility-inlines-hidden -fvisibility=hidden -flto -funsafe-math-optimizations -DXXH_VECTOR=XXH_SCALAR -DGLES_SILENCE_DEPRECATION=1
+OTHER_CFLAGS = $(inherited) -fno-operator-names -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fno-operator-names -fobjc-arc -fsingle-precision-constant -fmodules -fcxx-modules -fomit-frame-pointer -fvisibility-inlines-hidden -fvisibility=hidden -flto -funsafe-math-optimizations -DXXH_VECTOR=XXH_SCALAR -DGLES_SILENCE_DEPRECATION=1
 // Skip Simulator Build
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*] = *
 INCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*] = PVDebug.m

diff --git a/Cores/Play/BuildFlags.xcconfig b/Cores/Play/BuildFlags.xcconfig
@@ -24,7 +24,7 @@ OTHER_CFLAGS[arch=x86_64] = $(inherited) -DHAVE_SSE
 
 // MARK: ARM
 
-OTHER_CFLAGS[arch=arm64] = $(inherited) -D__ARM_NEON__ -DHAVE_NEON -march=armv8-a+crc -mno-thumb -mfpu=neon
+OTHER_CFLAGS[arch=arm64] = $(inherited) -march=armv8-a+crc // -D__ARM_NEON__ -DHAVE_NEON -mno-thumb -mfpu=neon
 
 // MARK: - Excluded Sources
 

diff --git a/Cores/Reicast/BuildFlags.xcconfig b/Cores/Reicast/BuildFlags.xcconfig
@@ -8,7 +8,7 @@
 
 // All
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) REICAST_VERSION=15.0 TARGET_NO_WEBUI=1 TARGET_NO_REC=1 NO_ASM=1
-OTHER_CFLAGS = $(inherited) -mno-thumb -mfpu=neon -fno-operator-names -fno-rtti -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fno-rtti -fpermissive -fno-operator-names -fsingle-precision-constant
+OTHER_CFLAGS = $(inherited) -fno-operator-names -fno-rtti -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fno-rtti -fpermissive -fno-operator-names -fsingle-precision-constant
 
 // MacOS Catalyst
 GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) TARGET_OSX=1

diff --git a/Cores/Stella/BuildFlags.xcconfig b/Cores/Stella/BuildFlags.xcconfig
@@ -21,8 +21,8 @@ CLANG_CXX_LANGUAGE_STANDARD = c++14
 
 
     // Device
-GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 NEON=1
-OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 // NEON=1
+OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited)
 
 // Simulator

diff --git a/Cores/TGBDual/PVTGBDual.xcodeproj/project.pbxproj b/Cores/TGBDual/PVTGBDual.xcodeproj/project.pbxproj
@@ -576,8 +576,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",
-					"-mno-thumb",
-					"-mfpu=neon",
 					"-fno-operator-names",
 					"-fno-rtti",
 					"-ffast-math",
@@ -779,8 +777,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
-					"-mno-thumb",
-					"-mfpu=neon",
 					"-fno-operator-names",
 					"-fno-rtti",
 					"-ffast-math",

diff --git a/Cores/emuThree/BuildFlags.xcconfig b/Cores/emuThree/BuildFlags.xcconfig
@@ -3,7 +3,7 @@
 
 // All
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
-OTHER_CFLAGS = $(inherited) -mno-thumb -mfpu=neon -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
+OTHER_CFLAGS = $(inherited) -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
 OTHER_LDFLAGS = $(inherited) -ObjC -DIPHONEOS
 
 // Swift <--> C++ Interop

diff --git a/PVLibrary/PVLibrary/Importer/Services/GameImporter.swift b/PVLibrary/PVLibrary/Importer/Services/GameImporter.swift
@@ -1232,19 +1232,20 @@ public extension GameImporter {
 
     func releaseID(forCRCs crcs: Set<String>) -> Int? {
         let roms = Table("ROMs")
-        let romID = Expression<Int>("romID")
-        let romHashCRC = Expression<String>("romHashCRC")
+        let romID = Expression<String>(value:"romID")
+        let romHashCRC = Expression<String>(value:"romHashCRC")
 
         let query = roms.select(romID).filter(crcs.contains(romHashCRC))
 
         do {
             let result = try sqldb.pluck(query)
-            let foundROMid = try result?.get(romID)
-            return foundROMid
+            if let foundROMid = try result?.get(romID) as? Int {
+                return foundROMid
+            }
         } catch {
             ELOG("Query error: \(error.localizedDescription)")
-            return nil
         }
+        return nil
     }
 
     enum DatabaseQueryError: Error {

diff --git a/PVSupport/PVLibRetro/PVLibRetro-Build.xcconfig b/PVSupport/PVLibRetro/PVLibRetro-Build.xcconfig
@@ -6,7 +6,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) __LIBRETRO__=1 HAVE_THREADS=1 HAVE_OPENGL=1 HAVE_OPENGLES=1 HAVE_OPENGLES2=1 HAVE_OPENGLES3=1 GLES=1 GLES2=1 GLES3=1 GLES31=1 
 // HAVE_PLAIN_DRM=1
 OTHER_CFLAGS = $(inherited) -ObjC
-OTHER_LDFLAGS = $(inherited) -ObjC -all_load
+OTHER_LDFLAGS = $(inherited) -ObjC -Wl,-U,_content_get_crc -Wl,-U,_input_driver_keyboard_mapping_set_block -Wl,-U,_runloop_msg_queue_push -Wl,-U,_filestream_open -Wl,-U,_filestream_read -Wl,-U,_filestream_close -Wl,-U,_RARCH_LOG -Wl,-U,_string_to_lower -Wl,-U,_rtime_localtime // -all_load
 
     // Device
 GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1