From 3c5440add702f404ac9b0eac25c2655b7b23b884 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Sun, 10 Sep 2017 20:26:46 -0500 Subject: CREATE_PROJECT: Move browser_osx.mm hack to Xcode generator c19c10d548b2867bc4fd003fb29ac0017b2bd29d 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). --- devtools/create_project/xcode.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'devtools/create_project') diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 7e4a70c157..78c3cf3dff 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -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++); } } -- cgit v1.2.3