diff options
| author | Vincent Bénony | 2015-12-01 21:18:53 +0100 |
|---|---|---|
| committer | Vincent Bénony | 2016-01-06 15:35:33 +0100 |
| commit | 4c68d145c2e9b6333d929a2bad828f14b3a1422b (patch) | |
| tree | 80bd2dad016fff4d6728f2078e6cc452492f6140 /devtools | |
| parent | 0dde5e4a183fdb551ba003487819052ce250cbc5 (diff) | |
| download | scummvm-rg350-4c68d145c2e9b6333d929a2bad828f14b3a1422b.tar.gz scummvm-rg350-4c68d145c2e9b6333d929a2bad828f14b3a1422b.tar.bz2 scummvm-rg350-4c68d145c2e9b6333d929a2bad828f14b3a1422b.zip | |
IOS: Keep the MACOSX, and IPHONE macros according to the target
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_project/xcode.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 76698ac556..084be76739 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -36,6 +36,9 @@ namespace CreateProjectTool { #define ADD_DEFINE(defines, name) \ defines.push_back(name); +#define REMOVE_DEFINE(defines, name) \ + { auto i = std::find(defines.begin(), defines.end(), name); if (i != defines.end()) defines.erase(i); } + #define ADD_SETTING(config, key, value) \ config.settings[key] = Setting(value, "", SettingsNoQuote); @@ -690,6 +693,11 @@ void XcodeProvider::setupBuildConfiguration() { ADD_SETTING_QUOTE_VAR(iPhone_Debug, "PROVISIONING_PROFILE[sdk=iphoneos*]", ""); ADD_SETTING(iPhone_Debug, "SDKROOT", "iphoneos4.0"); ADD_SETTING_QUOTE(iPhone_Debug, "TARGETED_DEVICE_FAMILY", "1,2"); + ValueList scummvmIOS_defines(_defines); + REMOVE_DEFINE(scummvmIOS_defines, "MACOSX"); + ADD_DEFINE(scummvmIOS_defines, "IPHONE"); + ADD_DEFINE(scummvmIOS_defines, "IPHONE_OFFICIAL"); + ADD_SETTING_LIST(iPhone_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmIOS_defines, SettingsNoQuote|SettingsAsList, 5); iPhone_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue); iPhone_Debug_Object->properties["buildSettings"] = iPhone_Debug; @@ -726,9 +734,9 @@ void XcodeProvider::setupBuildConfiguration() { ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic"); ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0"); ValueList scummvm_defines(_defines); - ADD_DEFINE(scummvm_defines, "IPHONE"); + REMOVE_DEFINE(scummvm_defines, "MACOSX"); + REMOVE_DEFINE(scummvm_defines, "IPHONE"); ADD_DEFINE(scummvm_defines, "XCODE"); - ADD_DEFINE(scummvm_defines, "IPHONE_OFFICIAL"); ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5); ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO"); ADD_SETTING(scummvm_Debug, "GCC_USE_GCC3_PFE_SUPPORT", "NO"); @@ -784,6 +792,7 @@ void XcodeProvider::setupBuildConfiguration() { ADD_SETTING(scummvmOSX_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO"); ADD_SETTING_QUOTE(scummvmOSX_Debug, "GCC_PREFIX_HEADER", ""); ValueList scummvmOSX_defines(_defines); + REMOVE_DEFINE(scummvmOSX_defines, "IPHONE"); ADD_DEFINE(scummvmOSX_defines, "SDL_BACKEND"); ADD_DEFINE(scummvmOSX_defines, "MACOSX"); ADD_SETTING_LIST(scummvmOSX_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmOSX_defines, SettingsNoQuote|SettingsAsList, 5); |