diff options
author | Vincent Bénony | 2015-12-04 18:20:09 +0100 |
---|---|---|
committer | Vincent Bénony | 2016-01-06 16:17:33 +0100 |
commit | 638dc113f8c05f121d50e68f68c4e86c130756a4 (patch) | |
tree | cbedc39632929b50063ec4f7df6c181652d83f02 /devtools/create_project/xcode.cpp | |
parent | 124d37247beaffbd48cd1e74c0eec3d4f38dc661 (diff) | |
download | scummvm-rg350-638dc113f8c05f121d50e68f68c4e86c130756a4.tar.gz scummvm-rg350-638dc113f8c05f121d50e68f68c4e86c130756a4.tar.bz2 scummvm-rg350-638dc113f8c05f121d50e68f68c4e86c130756a4.zip |
IOS: Create two targets for old iPhone (iOS <= 6) and new one (iOS >= 7)
The "iphone" backend is the support for the old iPhones.
The "ios7" backend is for the new iPhones.
Diffstat (limited to 'devtools/create_project/xcode.cpp')
-rw-r--r-- | devtools/create_project/xcode.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 2914920fd3..8365114863 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -96,7 +96,7 @@ bool targetIsIOS(const std::string &targetName) { bool shouldSkipFileForTarget(const std::string &fileID, const std::string &targetName, const std::string &fileName) { // Rules: - // - if the parent directory is "backends/platform/iphone", the file belongs to the iOS target. + // - if the parent directory is "backends/platform/ios7", the file belongs to the iOS target. // - if the parent directory is "/sdl", the file belongs to the OS X target. // - if the file has a suffix, like "_osx", or "_ios", the file belongs to one of the target. // - if the file is an OS X icon file (icns), it belongs to the OS X target. @@ -133,7 +133,7 @@ bool shouldSkipFileForTarget(const std::string &fileID, const std::string &targe } // parent directory const std::string directory = fileID.substr(0, fileID.length() - fileName.length()); - static const std::string iphone_directory = "backends/platform/iphone"; + static const std::string iphone_directory = "backends/platform/ios7"; if (directory.length() > iphone_directory.length() && directory.substr(directory.length() - iphone_directory.length()) == iphone_directory) { return true; } @@ -262,7 +262,7 @@ XcodeProvider::XcodeProvider(StringList &global_warnings, std::map<std::string, } void XcodeProvider::addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList) { - includeList.push_back(setup.srcDir + "/dists/iphone/Info.plist"); + includeList.push_back(setup.srcDir + "/dists/ios7/Info.plist"); ValueList &resources = getResourceFiles(); for (ValueList::iterator it = resources.begin(); it != resources.end(); ++it) { @@ -270,7 +270,7 @@ void XcodeProvider::addResourceFiles(const BuildSetup &setup, StringList &includ } StringList td; - createModuleList(setup.srcDir + "/backends/platform/iphone", setup.defines, td, includeList, excludeList); + createModuleList(setup.srcDir + "/backends/platform/ios7", setup.defines, td, includeList, excludeList); } void XcodeProvider::createWorkspace(const BuildSetup &setup) { @@ -765,7 +765,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { iPhone_HeaderSearchPaths.push_back("\"" + projectOutputDirectory + "\""); iPhone_HeaderSearchPaths.push_back("\"" + projectOutputDirectory + "/include\""); ADD_SETTING_LIST(iPhone_Debug, "HEADER_SEARCH_PATHS", iPhone_HeaderSearchPaths, SettingsAsList|SettingsQuoteVariable, 5); - ADD_SETTING_QUOTE(iPhone_Debug, "INFOPLIST_FILE", "$(SRCROOT)/dists/iphone/Info.plist"); + ADD_SETTING_QUOTE(iPhone_Debug, "INFOPLIST_FILE", "$(SRCROOT)/dists/ios7/Info.plist"); ValueList iPhone_LibPaths; iPhone_LibPaths.push_back("$(inherited)"); iPhone_LibPaths.push_back("\"" + projectOutputDirectory + "/lib\""); @@ -958,7 +958,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { void XcodeProvider::setupImageAssetCatalog(const BuildSetup &setup) { const std::string filename = "Images.xcassets"; - const std::string absoluteCatalogPath = _projectRoot + "/dists/iphone/" + filename; + const std::string absoluteCatalogPath = _projectRoot + "/dists/ios7/" + filename; const std::string id = "FileReference_" + absoluteCatalogPath; Group *group = touchGroupsForPath(absoluteCatalogPath); group->addChildFile(filename); @@ -967,7 +967,7 @@ void XcodeProvider::setupImageAssetCatalog(const BuildSetup &setup) { void XcodeProvider::setupAdditionalSources(std::string targetName, Property &files, int &order) { if (targetIsIOS(targetName)) { - const std::string absoluteCatalogPath = _projectRoot + "/dists/iphone/Images.xcassets"; + const std::string absoluteCatalogPath = _projectRoot + "/dists/ios7/Images.xcassets"; ADD_SETTING_ORDER_NOVALUE(files, getHash(absoluteCatalogPath), "Image Asset Catalog", order++); } } |