Skip to content

Commit 7eea19c

Browse files
SeiRyuSeiRyu
SeiRyu
authored and
SeiRyu
committed
Build: XCode16 beta2 compile
1 parent 470e3af commit 7eea19c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+9908
-2087
lines changed

‎Cores/BeetlePSX/BuildFlags.xcconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ GL_APIENTRYP=GLAPIENTRY*
1818
// EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(inherited)
1919

2020
// Device
21-
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 NEON=1 IOS=1 HAVE_OPENGLES3=1
21+
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 IOS=1 HAVE_OPENGLES3=1 //NEON=1
2222

2323
// TODO: Why does this result in some missing symbols?
2424
// HAVE_OPENGLES_3_1=1
2525

26-
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
26+
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
2727
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited)
2828

2929
// Simulator

‎Cores/Mednafen/Config.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HAVE_LROUND HAVE_MKDIR HAVE_PTHREAD_
2020
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=
2121
OTHER_CFLAGS[arch=armv7] = -mfpu=neon $(inherited)
2222
OTHER_CFLAGS[arch=armv7s] = -mfpu=neon $(inherited)
23-
OTHER_CFLAGS[arch=arm64] = -mfpu=neon $(inherited)
23+
//OTHER_CFLAGS[arch=arm64] = -mfpu=neon $(inherited)
2424
OTHER_CFLAGS[arch=x86_64] = $(inherited)
2525

2626
// MacOS Catalyst

‎Cores/Mu/PVMu.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -1807,8 +1807,6 @@
18071807
MTL_ENABLE_DEBUG_INFO = NO;
18081808
OTHER_CFLAGS = (
18091809
"$(inherited)",
1810-
"-mno-thumb",
1811-
"-mfpu=neon",
18121810
"-fno-operator-names",
18131811
"-fno-rtti",
18141812
"-ffast-math",
@@ -2099,8 +2097,6 @@
20992097
ONLY_ACTIVE_ARCH = YES;
21002098
OTHER_CFLAGS = (
21012099
"$(inherited)",
2102-
"-mno-thumb",
2103-
"-mfpu=neon",
21042100
"-fno-operator-names",
21052101
"-fno-rtti",
21062102
"-ffast-math",

‎Cores/Mupen64Plus-NX/Config.xcconfig

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OTHER_LDFLAGS= $(inherited)
1212
// -EGL < android
1313

1414
// DEFINES by Arch's
15-
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
15+
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
1616
// strdup=_strdup strlcpy=_strlcpy __unix__
1717
GCC_PREPROCESSOR_DEFINITIONS[arch=arm64] = $(inherited) NEW_DYNAREC=4 DYNAREC=3
1818
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
2121

2222
// MacOS Catalyst
2323
GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) OS_MAC_OS_X=1 SDL_VIDEO_OPENGL=1
24-
OTHER_CFLAGS[sdk=macosx*] = $(inherited) -fno-strict-aliasing -fvisibility=hidden -DGCC -pthread -fPIC -D__unix__ -D__VEC4_OPT -D__NEON_OPT -DX86_ASM
24+
OTHER_CFLAGS[sdk=macosx*] = $(inherited) -fno-strict-aliasing -fvisibility=hidden -DGCC -pthread -fPIC -D__unix__ -D__VEC4_OPT -DX86_ASM //-D__NEON_OPT
2525
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(inherited) 3DMathNeon.cpp gSPNeon.cpp RSP_LoadMatrixNeon.cpp CRC_OPT_NEON.cpp
2626

2727
// iPhone
28-
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
29-
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -DOS_IOS -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
28+
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 //NEON=1
29+
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -DOS_IOS -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
3030
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited) 3DMath.cpp
3131

3232
// Simulator
33-
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
33+
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 //NEON=1 SDL_VIDEO_OPENGL_ES2=1
3434
OTHER_CFLAGS[sdk=iphonesimulator*] = $(inherited) -DOS_IOS
3535
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
3636

3737
// tvOS Device
38-
GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
39-
OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DOS_IOS -mfpu=neon -D__VEC4_OPT
38+
GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 //NEON=1
39+
OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DOS_IOS -D__VEC4_OPT // -mfpu=neon
4040
EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*] = $(inherited) 3DMath.cpp
4141

4242
// tvOS Simulator
43-
GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 NEON=1 SDL_VIDEO_OPENGL_ES2=1
44-
OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -DOS_IOS
43+
GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) OS_IOS GLESX USE_GLES=1 SDL_VIDEO_OPENGL_ES2=1 // NEON=1
44+
OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -DOS_IOS
4545

4646

4747

‎Cores/PPSSPP/BuildFlags.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -DDRC_SH2 -D_USE_CZ80
1919
//OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) -D_USE_CZ80
2020
//OTHER_CFLAGS = $(inherited) -DXXH_VECTOR=XXH_SCALAR -DMASKED_PSP_MEMORY=TRUE
21-
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
21+
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
2222
// Skip Simulator Build
2323
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*] = *
2424
INCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=*] = PVDebug.m

‎Cores/Play/BuildFlags.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ OTHER_CFLAGS[arch=x86_64] = $(inherited) -DHAVE_SSE
2424

2525
// MARK: ARM
2626

27-
OTHER_CFLAGS[arch=arm64] = $(inherited) -D__ARM_NEON__ -DHAVE_NEON -march=armv8-a+crc -mno-thumb -mfpu=neon
27+
OTHER_CFLAGS[arch=arm64] = $(inherited) -march=armv8-a+crc // -D__ARM_NEON__ -DHAVE_NEON -mno-thumb -mfpu=neon
2828

2929
// MARK: - Excluded Sources
3030

‎Cores/Reicast/BuildFlags.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// All
1010
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) REICAST_VERSION=15.0 TARGET_NO_WEBUI=1 TARGET_NO_REC=1 NO_ASM=1
11-
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
11+
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
1212

1313
// MacOS Catalyst
1414
GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) TARGET_OSX=1

‎Cores/Stella/BuildFlags.xcconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ CLANG_CXX_LANGUAGE_STANDARD = c++14
2121

2222

2323
// Device
24-
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 NEON=1
25-
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
24+
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 // NEON=1
25+
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -D__VEC4_OPT // -D__NEON_OPT -mfpu=neon
2626
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited)
2727

2828
// Simulator

‎Cores/TGBDual/PVTGBDual.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,6 @@
576576
MTL_ENABLE_DEBUG_INFO = NO;
577577
OTHER_CFLAGS = (
578578
"$(inherited)",
579-
"-mno-thumb",
580-
"-mfpu=neon",
581579
"-fno-operator-names",
582580
"-fno-rtti",
583581
"-ffast-math",
@@ -779,8 +777,6 @@
779777
ONLY_ACTIVE_ARCH = YES;
780778
OTHER_CFLAGS = (
781779
"$(inherited)",
782-
"-mno-thumb",
783-
"-mfpu=neon",
784780
"-fno-operator-names",
785781
"-fno-rtti",
786782
"-ffast-math",

‎Cores/emuThree/BuildFlags.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// All
55
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
6-
OTHER_CFLAGS = $(inherited) -mno-thumb -mfpu=neon -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
6+
OTHER_CFLAGS = $(inherited) -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
77
OTHER_LDFLAGS = $(inherited) -ObjC -DIPHONEOS
88

99
// Swift <--> C++ Interop

‎PVLibrary/PVLibrary/Importer/Services/GameImporter.swift

+6-5
Original file line numberDiff line numberDiff line change
@@ -1232,19 +1232,20 @@ public extension GameImporter {
12321232

12331233
func releaseID(forCRCs crcs: Set<String>) -> Int? {
12341234
let roms = Table("ROMs")
1235-
let romID = Expression<Int>("romID")
1236-
let romHashCRC = Expression<String>("romHashCRC")
1235+
let romID = Expression<String>(value:"romID")
1236+
let romHashCRC = Expression<String>(value:"romHashCRC")
12371237

12381238
let query = roms.select(romID).filter(crcs.contains(romHashCRC))
12391239

12401240
do {
12411241
let result = try sqldb.pluck(query)
1242-
let foundROMid = try result?.get(romID)
1243-
return foundROMid
1242+
if let foundROMid = try result?.get(romID) as? Int {
1243+
return foundROMid
1244+
}
12441245
} catch {
12451246
ELOG("Query error: \(error.localizedDescription)")
1246-
return nil
12471247
}
1248+
return nil
12481249
}
12491250

12501251
enum DatabaseQueryError: Error {

‎PVSupport/PVLibRetro/PVLibRetro-Build.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
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
77
// HAVE_PLAIN_DRM=1
88
OTHER_CFLAGS = $(inherited) -ObjC
9-
OTHER_LDFLAGS = $(inherited) -ObjC -all_load
9+
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 // -all_load
1010

1111
// Device
1212
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1

0 commit comments

Comments
 (0)