@@ -121,25 +121,31 @@ settings:
121121 - " USE_GLES_ES2=1"
122122 - " USE_GLES_ES3=1"
123123 - " USE_GLES_ES3_2=1"
124- OTHER_CFLAGS : " $(inherited) -fno-strict-aliasing -fvisibility=hidden -fomit-frame-pointer -fvisibility-inlines-hidden -fPIC -pthread"
125- # ARMv8 / Apple CPU tuning: apply only to arm64 slices to avoid passing ARM-only flags to x86_64 simulator toolchains
126- " OTHER_CFLAGS[arch=arm64] " : " $(inherited) -march=armv8-a+simd+crc+crypto -mcpu=apple-a10 -mtune=apple-a15"
127- # Explicit x86_64 override: inherit base flags, no ARM-specific tuning
128- " OTHER_CFLAGS[arch=x86_64] " : " $(inherited)"
129- # SDK-specific OTHER_CFLAGS (mirrors Config.xcconfig)
130- " OTHER_CFLAGS[sdk=iphoneos*] " : " $(inherited) -DOS_IOS -D__VEC4_OPT -D__NEON_OPT"
131- " OTHER_CFLAGS[sdk=iphonesimulator*] " : " $(inherited) -DOS_IOS"
132- " OTHER_CFLAGS[sdk=appletvos*] " : " $(inherited) -DOS_IOS -D__VEC4_OPT -D__NEON_OPT"
133- " OTHER_CFLAGS[sdk=appletvsimulator*] " : " $(inherited) -DOS_IOS"
124+ # Compose OTHER_CFLAGS from helper settings so arch-tuning and SDK defines
125+ # are both applied. Xcode resolves a single conditionalized value per build
126+ # dimension, so split them into M64_ARCH_CFLAGS + M64_SDK_CFLAGS and
127+ # reference both from the unconditional OTHER_CFLAGS entry.
128+ OTHER_CFLAGS : " $(inherited) -fno-strict-aliasing -fvisibility=hidden -fomit-frame-pointer -fvisibility-inlines-hidden -fPIC -pthread $(M64_ARCH_CFLAGS) $(M64_SDK_CFLAGS)"
129+ # ARMv8 / Apple CPU tuning helper — applied only on arm64 slices
130+ M64_ARCH_CFLAGS : " "
131+ " M64_ARCH_CFLAGS[arch=arm64] " : " -march=armv8-a+simd+crc+crypto -mcpu=apple-a10 -mtune=apple-a15"
132+ " M64_ARCH_CFLAGS[arch=x86_64] " : " "
133+ # SDK-specific C defines helper (mirrors Config.xcconfig)
134+ M64_SDK_CFLAGS : " "
135+ " M64_SDK_CFLAGS[sdk=iphoneos*] " : " -DOS_IOS -D__VEC4_OPT -D__NEON_OPT"
136+ " M64_SDK_CFLAGS[sdk=iphonesimulator*] " : " -DOS_IOS"
137+ " M64_SDK_CFLAGS[sdk=appletvos*] " : " -DOS_IOS -D__VEC4_OPT -D__NEON_OPT"
138+ " M64_SDK_CFLAGS[sdk=appletvsimulator*] " : " -DOS_IOS"
134139 # macOS preprocessor defines (mirrors Config.xcconfig)
135140 " GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] " :
136141 - " $(inherited)"
137142 - " OS_MAC_OS_X=1"
138143 - " SDL_VIDEO_OPENGL=1"
139144 # Exclude non-NEON sources on tvOS device (mirrors Config.xcconfig)
140145 " EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*] " : " $(inherited) 3DMath.cpp RSP_LoadMatrix.cpp CRC_OPT.cpp"
141- # tvOS Simulator: default source behavior (XcodeGen resolves sources explicitly;
142- # PVDebug.c stub sourcing is handled per-target via dedicated Debug target)
146+ # tvOS Simulator: use inherited source inclusion/exclusion behavior.
147+ # XcodeGen resolves sources explicitly for each target; no additional stub
148+ # files are required beyond what each target already declares.
143149 " EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*] " : " $(inherited)"
144150 " INCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*] " : " $(inherited)"
145151 HEADER_SEARCH_PATHS : " $(inherited)"
@@ -569,7 +575,7 @@ targets:
569575 - " $(inherited)"
570576 - " Sources/Compatibility/GlideN/"
571577 - " Sources/Plugins/Video/gliden64/src"
572- - " Sources/Plugins/Video/rice/src"
578+ - " Sources/Plugins/Video/rice/rice/ src"
573579 - " Sources/Plugins/Core/Core/src"
574580 OTHER_CFLAGS :
575581 - " $(inherited)"
0 commit comments