ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

CREATE_PROJECT: Define SCUMMVM_NEON for iphoneos and tvos

Browse Source 
Add the definition of SCUMMVM_NEON in create_project for the iOS
and tvOS targets. Do not add the same definition to corresponding
simulators since they can run on x86_64 hosts, which for obvious
reasons lacks support for NEON.
This commit is contained in:
Lars Sundström
2023-09-03 22:26:37 +02:00
committed by Eugene Sandulenko
parent db192eed39
commit 76af53dc7f
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devtools/create_project/xcode.cpp
+23 -12
View File
@@ -1396,13 +1396,18 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", "");
ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos");
ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2");
ValueList scummvmIOS_defines;
ADD_DEFINE(scummvmIOS_defines, "\"$(inherited)\"");
ADD_DEFINE(scummvmIOS_defines, "IPHONE");
ADD_DEFINE(scummvmIOS_defines, "IPHONE_IOS7");
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(scummvmIOS_defines, "WITHOUT_SDL");
ADD_SETTING_LIST(iPhone_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmIOS_defines, kSettingsNoQuote | kSettingsAsList, 5);
ADD_DEFINE(scummvmIOSsimulator_defines, "WITHOUT_SDL");
ADD_SETTING_LIST(iPhone_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]\"", scummvmIOSsimulator_defines, kSettingsNoQuote | kSettingsAsList, 5);
// 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");
@@ -1554,13 +1559,18 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ADD_SETTING_QUOTE_VAR(tvOS_Debug, "PROVISIONING_PROFILE[sdk=appletvos*]", "");
ADD_SETTING(tvOS_Debug, "SDKROOT", "appletvos");
ADD_SETTING_QUOTE(tvOS_Debug, "TARGETED_DEVICE_FAMILY", "3");
ValueList scummvmTVOS_defines;
ADD_DEFINE(scummvmTVOS_defines, "\"$(inherited)\"");
ADD_DEFINE(scummvmTVOS_defines, "IPHONE");
ADD_DEFINE(scummvmTVOS_defines, "IPHONE_IOS7");
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(scummvmTVOS_defines, "WITHOUT_SDL");
ADD_SETTING_LIST(tvOS_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmTVOS_defines, kSettingsNoQuote | kSettingsAsList, 5);
ADD_DEFINE(scummvmTVOSsimulator_defines, "WITHOUT_SDL");
ADD_SETTING_LIST(tvOS_Debug, "\"GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*]\"", scummvmTVOSsimulator_defines, kSettingsNoQuote | kSettingsAsList, 5);
// 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");
tvOS_Debug_Object->addProperty("name", "Debug", "", kSettingsNoValue);
@@ -1644,6 +1654,7 @@ void XcodeProvider::setupDefines(const BuildSetup &setup) {
REMOVE_DEFINE(_defines, "IPHONE");
REMOVE_DEFINE(_defines, "IPHONE_IOS7");
REMOVE_DEFINE(_defines, "SDL_BACKEND");
REMOVE_DEFINE(_defines, "SCUMMVM_NEON");
ADD_DEFINE(_defines, "CONFIG_H");
ADD_DEFINE(_defines, "UNIX");
ADD_DEFINE(_defines, "HAS_FSEEKO_OFFT_64");