[Scummvm-git-logs] scummvm branch-3-0 -> 48d461f6055f9779d599c039686cc4069731d58e

[larsamannen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
d504c372ca CREATE_PROJECT: Remove duplicated preprocessor definitions in xcode
48d461f605 CREATE_PROJECT: Do not set SCUMMVM_NEON for all iOS/tvOS targets


Commit: d504c372ca5cf2a7d4d51f95704e5047e1e51e56
    https://github.com/scummvm/scummvm/commit/d504c372ca5cf2a7d4d51f95704e5047e1e51e56
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2025-12-17T07:03:15+01:00

Commit Message:
CREATE_PROJECT: Remove duplicated preprocessor definitions in xcode

The IPHONE and IPHONE_IOS7 definitions are already set for all iOS
targets in create_project. The simulator targets were adding them
once again. Remove the duplicates.

(cherry picked from commit d4492930be524d0a716a4b671c0b8f36b96432a4)

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 9116d09447e..0d65c7616cc 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1478,8 +1478,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 		ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
 		ValueList scummvmIOSsimulator_defines;
 		ADD_DEFINE(scummvmIOSsimulator_defines, "\"$(inherited)\"");
-		ADD_DEFINE(scummvmIOSsimulator_defines, "IPHONE");
-		ADD_DEFINE(scummvmIOSsimulator_defines, "IPHONE_IOS7");
 		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET"))
 			ADD_DEFINE(scummvmIOSsimulator_defines, "WITHOUT_SDL");
 		ADD_SETTING_LIST(iPhone_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]\"", scummvmIOSsimulator_defines, kSettingsNoQuote | kSettingsAsList, 5);
@@ -1561,8 +1559,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 		ADD_SETTING_QUOTE(tvOS_Debug, "TARGETED_DEVICE_FAMILY", "3");
 		ValueList scummvmTVOSsimulator_defines;
 		ADD_DEFINE(scummvmTVOSsimulator_defines, "\"$(inherited)\"");
-		ADD_DEFINE(scummvmTVOSsimulator_defines, "IPHONE");
-		ADD_DEFINE(scummvmTVOSsimulator_defines, "IPHONE_IOS7");
 		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET"))
 			ADD_DEFINE(scummvmTVOSsimulator_defines, "WITHOUT_SDL");
 		ADD_SETTING_LIST(tvOS_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*]\"", scummvmTVOSsimulator_defines, kSettingsNoQuote | kSettingsAsList, 5);


Commit: 48d461f6055f9779d599c039686cc4069731d58e
    https://github.com/scummvm/scummvm/commit/48d461f6055f9779d599c039686cc4069731d58e
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2025-12-17T07:03:25+01:00

Commit Message:
CREATE_PROJECT: Do not set SCUMMVM_NEON for all iOS/tvOS targets

The iOS simulator x86_64 target doesn't support NEON and since there
is no way to have different preprocessor macros for different archs,
then enable SCUMMVM_NEON only for all non-simulator iOS/tvOS targets.

(cherry picked from commit c7c5fa299c9541eca8bba56bdd7ade81c3a1abaa)

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 0d65c7616cc..45732b97105 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1310,6 +1310,11 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_OPENGL_GAME")) {
 		ADD_DEFINE(scummvm_defines, "USE_OPENGL_GAME");
 	}
+	// If building for iOS/tvOS the SCUMMVM_NEON flag is set. However, the
+	// x86_64 iOS/tvOS simulators does't support NEON so we need to remove
+	// the define and re-add it to the iOS/tvOS targets later.
+	REMOVE_DEFINE(scummvm_defines, "SCUMMVM_NEON");
+
 	ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5);
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_ABOUT_RETURN_TYPE", "YES");
 	ADD_SETTING(scummvm_Debug, "GCC_WARN_UNUSED_VARIABLE", "YES");
@@ -1484,6 +1489,8 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 		// Separate iphoneos and iphonesimulator definitions since simulator running on x86_64
 		// hosts doesn't support NEON
 		ValueList scummvmIOS_defines = scummvmIOSsimulator_defines;
+		ADD_DEFINE(scummvmIOS_defines, "SCUMMVM_NEON");
+
 		ADD_SETTING_LIST(iPhone_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]\"", scummvmIOS_defines, kSettingsNoQuote | kSettingsAsList, 5);
 		ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon");
 		ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME", "LaunchImage");
@@ -1565,6 +1572,8 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 		// Separate appletvos and appletvsimulator definitions since simulator running on x86_64
 		// hosts doesn't support NEON
 		ValueList scummvmTVOS_defines = scummvmTVOSsimulator_defines;
+		ADD_DEFINE(scummvmTVOS_defines, "SCUMMVM_NEON");
+
 		ADD_SETTING_LIST(tvOS_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*]\"", scummvmTVOS_defines, kSettingsNoQuote | kSettingsAsList, 5);
 		ADD_SETTING(tvOS_Debug, "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon");
 		ADD_SETTING(tvOS_Debug, "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME", "LaunchImage");