diff options
| author | Eugene Sandulenko | 2016-09-04 10:47:56 +0200 |
|---|---|---|
| committer | GitHub | 2016-09-04 10:47:56 +0200 |
| commit | 27c0ddd8073bec0f3685c29ee95373f1789bc13c (patch) | |
| tree | 0e7abddb1d57a8c791833946199d3cdb2c1c60d2 | |
| parent | 923efc2a4e1ad208f44a38ee6aa80316fbda1ade (diff) | |
| parent | 2ad082aeb75f81159f942ce0d6f5c2f0fde08feb (diff) | |
| download | scummvm-rg350-27c0ddd8073bec0f3685c29ee95373f1789bc13c.tar.gz scummvm-rg350-27c0ddd8073bec0f3685c29ee95373f1789bc13c.tar.bz2 scummvm-rg350-27c0ddd8073bec0f3685c29ee95373f1789bc13c.zip | |
Merge pull request #822 from csnover/apple-network-browser
CREATE_PROJECT: Fix networking backend file targets in Xcode
| -rw-r--r-- | devtools/create_project/xcode.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 07dc24e315..18dc74f799 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -111,7 +111,13 @@ bool shouldSkipFileForTarget(const std::string &fileID, const std::string &targe // - if the file is an macOS icon file (icns), it belongs to the macOS target. std::string name, ext; splitFilename(fileName, name, ext); + if (targetIsIOS(targetName)) { + // networking backend for iOS is openurl-default + if (name == "openurl-posix" || name == "openurl-osx") { + return true; + } + // iOS target: we skip all files with the "_osx" suffix if (name.length() > 4 && name.substr(name.length() - 4) == "_osx") { return true; @@ -150,6 +156,11 @@ bool shouldSkipFileForTarget(const std::string &fileID, const std::string &targe if (directory.length() > iphone_directory.length() && directory.substr(directory.length() - iphone_directory.length()) == iphone_directory) { return true; } + + // networking backend for macOS is openurl-osx + if (name == "openurl-default" || name == "openurl-posix") { + return true; + } } return false; } |