[Scummvm-git-logs] scummvm master -> 27c0ddd8073bec0f3685c29ee95373f1789bc13c
sev-
sev at scummvm.org
Sun Sep 4 10:47:59 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2ad082aeb7 CREATE_PROJECT: Fix networking backend file targets in Xcode
27c0ddd807 Merge pull request #822 from csnover/apple-network-browser
Commit: 2ad082aeb75f81159f942ce0d6f5c2f0fde08feb
https://github.com/scummvm/scummvm/commit/2ad082aeb75f81159f942ce0d6f5c2f0fde08feb
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-09-01T21:09:03-05:00
Commit Message:
CREATE_PROJECT: Fix networking backend file targets in Xcode
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 07dc24e..18dc74f 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;
}
Commit: 27c0ddd8073bec0f3685c29ee95373f1789bc13c
https://github.com/scummvm/scummvm/commit/27c0ddd8073bec0f3685c29ee95373f1789bc13c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T10:47:56+02:00
Commit Message:
Merge pull request #822 from csnover/apple-network-browser
CREATE_PROJECT: Fix networking backend file targets in Xcode
Changed paths:
devtools/create_project/xcode.cpp
More information about the Scummvm-git-logs
mailing list