aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorSupSuper2019-12-16 01:03:06 +0000
committerSupSuper2019-12-16 01:03:06 +0000
commit316bb297b3bc3f8e2a61aed3acfcd22367009294 (patch)
tree468f4e843dc5328c00ef528a2dab1c5816bf2fd6 /devtools
parenta29f1fdbb487a09e1c82d9dcef6b46277b4bc733 (diff)
downloadscummvm-rg350-316bb297b3bc3f8e2a61aed3acfcd22367009294.tar.gz
scummvm-rg350-316bb297b3bc3f8e2a61aed3acfcd22367009294.tar.bz2
scummvm-rg350-316bb297b3bc3f8e2a61aed3acfcd22367009294.zip
CREATE_PROJECT: Only link to sapi on Windows
Diffstat (limited to 'devtools')
-rw-r--r--devtools/create_project/create_project.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 391449cc60..7bcea8e795 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -393,13 +393,13 @@ int main(int argc, char *argv[]) {
bool updatesEnabled = false, curlEnabled = false, sdlnetEnabled = false, ttsEnabled = false;
for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
if (i->enable) {
- if (!strcmp(i->name, "updates"))
+ if (!updatesEnabled && !strcmp(i->name, "updates"))
updatesEnabled = true;
- else if (!strcmp(i->name, "libcurl"))
+ else if (!curlEnabled && !strcmp(i->name, "libcurl"))
curlEnabled = true;
- else if (!strcmp(i->name, "sdlnet"))
+ else if (!sdlnetEnabled && !strcmp(i->name, "sdlnet"))
sdlnetEnabled = true;
- else if (!strcmp(i->name, "tts"))
+ else if (!ttsEnabled && !strcmp(i->name, "tts"))
ttsEnabled = true;
}
}
@@ -423,13 +423,12 @@ int main(int argc, char *argv[]) {
if (sdlnetEnabled) {
setup.libraries.push_back("iphlpapi");
}
+ if (ttsEnabled) {
+ setup.libraries.push_back("sapi");
+ }
setup.libraries.push_back("winmm");
}
- if (ttsEnabled) {
- setup.libraries.push_back("sapi");
- }
-
setup.defines.push_back("SDL_BACKEND");
if (!setup.useSDL2) {
cout << "\nBuilding against SDL 1.2\n\n";
@@ -1095,7 +1094,7 @@ const Feature s_features[] = {
{ "langdetect", "USE_DETECTLANG", "", true, "System language detection support" }, // This feature actually depends on "translation", there
// is just no current way of properly detecting this...
{ "text-console", "USE_TEXT_CONSOLE_FOR_DEBUGGER", "", false, "Text console debugger" }, // This feature is always applied in xcode projects
- { "tts", "USE_TTS", "", true, "Text to speech support"}
+ { "tts", "USE_TTS", "", true, "Text to speech support"}
};
const Tool s_tools[] = {