diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 8e81a339ba1..6aca7d730b7 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -413,6 +413,7 @@ int main(int argc, char *argv[]) { // the files, according to the target. setup.defines.push_back("MACOSX"); setup.defines.push_back("IPHONE"); + setup.defines.push_back("SCUMMVM_NEON"); } else if (projectType == kProjectMSVC || projectType == kProjectCodeBlocks) { setup.defines.push_back("WIN32"); backendWin32 = true; diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 783f035a584..989bf1ab8de 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -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");