thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Sync with ScummVM

Browse source
This commit is contained in:
Pawel Kolodziejski 2016-11-12 12:59:06 +01:00
parent 2b4320fab7
commit 19bcd1f3bc
376 changed files with 52910 additions and 13744 deletions
Download patch file Download diff file Expand all files Collapse all files

31
devtools/create_project/create_project.cpp
View file

@ -284,8 +284,8 @@ int main(int argc, char *argv[]) {
setup.devTools = true;
} else if (!std::strcmp(argv[i], "--tests")) {
setup.tests = true;
} else if (!std::strcmp(argv[i], "--sdl2")) {
setup.useSDL2 = true;
} else if (!std::strcmp(argv[i], "--sdl1")) {
setup.useSDL2 = false;
} else {
std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n";
return -1;
@ -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";
@ -524,6 +536,8 @@ int main(int argc, char *argv[]) {
// 4355 ('this' : used in base member initializer list)
// only disabled for specific engines where it is used in a safe way
//
// 4373 (previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers)
//
// 4510 ('class' : default constructor could not be generated)
//
// 4511 ('class' : copy constructor could not be generated)
@ -573,6 +587,8 @@ int main(int argc, char *argv[]) {
projectWarnings["m4"].push_back("4355");
projectWarnings["sci"].push_back("4373");
if (msvcVersion == 9)
provider = new CreateProjectTool::VisualStudioProvider(globalWarnings, projectWarnings, msvcVersion);
else
@ -696,7 +712,7 @@ void displayHelp(const char *exe) {
" --disable-<name> disable inclusion of the feature \"name\"\n"
"\n"
"SDL settings:\n"
" --sdl2 link to SDL 2.0, instead of SDL 1.2\n"
" --sdl1 link to SDL 1.2, instead of SDL 2.0\n"
"\n"
" There are the following features available:\n"
"\n";
@ -1000,6 +1016,8 @@ const Feature s_features[] = {
{ "freetype", "USE_FREETYPE2", "freetype", true, "FreeType support" },
{ "jpeg", "USE_JPEG", "jpeg-static", true, "libjpeg support" },
{"fluidsynth", "USE_FLUIDSYNTH", "libfluidsynth", true, "FluidSynth support" },
{ "libcurl", "USE_LIBCURL", "libcurl", false, "libcurl support" },
{ "sdlnet", "USE_SDL_NET", "SDL_net", false, "SDL_net support" },
// Feature flags
{ "bink", "USE_BINK", "", true, "Bink video support" },
@ -1011,6 +1029,7 @@ const Feature s_features[] = {
{ "opengl", "USE_OPENGL", "", true, "OpenGL support" },
{ "opengles", "USE_GLES", "", true, "forced OpenGL ES mode" },
{ "taskbar", "USE_TASKBAR", "", true, "Taskbar integration support" },
{ "cloud", "USE_CLOUD", "", true, "Cloud integration support" },
{ "translation", "USE_TRANSLATION", "", true, "Translation support" },
{ "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"},
{ "keymapper", "ENABLE_KEYMAPPER", "", false, "Keymapper support"},