aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorPaul Gilbert2016-10-20 21:00:32 -0400
committerPaul Gilbert2016-10-20 21:00:32 -0400
commit990bd641ae348f2340c6231d49e6fdcc0404ea29 (patch)
treec40899e88607d69ba9d6c6843fc478f947d68b54 /devtools
parent1981131f99d4fb56ae265cd236bc50d0dcebd110 (diff)
downloadscummvm-rg350-990bd641ae348f2340c6231d49e6fdcc0404ea29.tar.gz
scummvm-rg350-990bd641ae348f2340c6231d49e6fdcc0404ea29.tar.bz2
scummvm-rg350-990bd641ae348f2340c6231d49e6fdcc0404ea29.zip
CREATE_PROJECT: Fix MSVC project creation with curl or SDL_Net enabled
Diffstat (limited to 'devtools')
-rw-r--r--devtools/create_project/create_project.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 91690c2128..8eba73d7b3 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";