thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CREATE_PROJECT: Move browser_osx.mm hack to Xcode generator

Browse source 
c19c10d548 fixed the bad parsing of
module.mk which meant the Xcode generator broke. For the moment,
just move the hack for browser_osx.mm into the generator, until
there is a more elegant solution to this problem (if ever).
This commit is contained in:
Colin Snover 2017-09-10 20:26:46 -05:00
parent 9db0c9c607
commit 3c5440add7
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
devtools/create_project/xcode.cpp
View file

@ -389,6 +389,14 @@ void XcodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &p
// for folders, we shouldn't add folders as file references, obviously.
if (node->children.empty()) {
group->addChildFile(node->name);
// HACK: Also add browser_osx.mm, since browser.cpp is added for
// iOS and browser_osx.mm for macOS, and create_project cannot
// deal with two competing exclusive ifdefs in module.mk going
// into one project
if (filePrefix.find("/gui/") == filePrefix.size() - 5 && node->name == "browser.cpp") {
group->addChildFile("browser_osx.mm");
}
}
// Process child nodes
if (!node->children.empty())
@ -1066,6 +1074,11 @@ void XcodeProvider::setupAdditionalSources(std::string targetName, Property &fil
if (targetIsIOS(targetName)) {
const std::string absoluteCatalogPath = _projectRoot + "/dists/ios7/Images.xcassets";
ADD_SETTING_ORDER_NOVALUE(files, getHash(absoluteCatalogPath), "Image Asset Catalog", order++);
} else {
// HACK: browser_osx.mm needs to be added
const std::string browserPath = "gui/browser_osx.mm";
const std::string comment = "browser_osx.mm in Sources";
ADD_SETTING_ORDER_NOVALUE(files, getHash(browserPath), comment, order++);
}
}