[Scummvm-git-logs] scummvm master -> 990bd641ae348f2340c6231d49e6fdcc0404ea29
dreammaster
dreammaster at scummvm.org
Fri Oct 21 03:00:44 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
990bd641ae CREATE_PROJECT: Fix MSVC project creation with curl or SDL_Net enabled
Commit: 990bd641ae348f2340c6231d49e6fdcc0404ea29
https://github.com/scummvm/scummvm/commit/990bd641ae348f2340c6231d49e6fdcc0404ea29
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-20T21:00:32-04:00
Commit Message:
CREATE_PROJECT: Fix MSVC project creation with curl or SDL_Net enabled
Changed paths:
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 91690c2..8eba73d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -373,11 +373,18 @@ int main(int argc, char *argv[]) {
#endif
}
- bool updatesEnabled = false;
+ bool updatesEnabled = false, curlEnabled = false, sdlnetEnabled = false;
for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
- if (i->enable && !strcmp(i->name, "updates"))
- updatesEnabled = true;
+ if (i->enable) {
+ if (!strcmp(i->name, "updates"))
+ updatesEnabled = true;
+ else if (!strcmp(i->name, "libcurl"))
+ curlEnabled = true;
+ else if (!strcmp(i->name, "sdlnet"))
+ sdlnetEnabled = true;
+ }
}
+
if (updatesEnabled) {
setup.defines.push_back("USE_SPARKLE");
if (projectType != kProjectXcode)
@@ -386,6 +393,11 @@ int main(int argc, char *argv[]) {
setup.libraries.push_back("sparkle");
}
+ if (curlEnabled && projectType == kProjectMSVC)
+ setup.defines.push_back("CURL_STATICLIB");
+ if (sdlnetEnabled && projectType == kProjectMSVC)
+ setup.libraries.push_back("iphlpapi");
+
setup.defines.push_back("SDL_BACKEND");
if (!setup.useSDL2) {
cout << "\nBuilding against SDL 1.2\n\n";
More information about the Scummvm-git-logs
mailing list