[Scummvm-git-logs] scummvm master -> 61e2c5c92849df87dfe22270fa64daf7f30dbd04

[bluegr]

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:
61e2c5c928 CREATE_PROJECT: Consistent name for zlib


Commit: 61e2c5c92849df87dfe22270fa64daf7f30dbd04
    https://github.com/scummvm/scummvm/commit/61e2c5c92849df87dfe22270fa64daf7f30dbd04
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-01-06T22:43:05+02:00

Commit Message:
CREATE_PROJECT: Consistent name for zlib

The feature name didn't match with other code.

Changed paths:
    devtools/create_project/cmake.cpp
    devtools/create_project/codeblocks.cpp
    devtools/create_project/create_project.cpp
    devtools/create_project/msvc.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index af347529e5b..6aa6dec9ba3 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -38,7 +38,7 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 		{ "sdl",        "sdl",               kSDLVersion1,   "FindSDL",      "SDL",      "SDL_INCLUDE_DIR",       "SDL_LIBRARY",         nullptr      },
 		{ "sdl",        "sdl2",              kSDLVersion2,   nullptr,        "SDL2",     nullptr,                 "SDL2_LIBRARIES",      nullptr      },
 		{ "freetype",   "freetype2",         kSDLVersionAny, "FindFreetype", "Freetype", "FREETYPE_INCLUDE_DIRS", "FREETYPE_LIBRARIES",  nullptr      },
-		{ "libz",       "zlib",              kSDLVersionAny, "FindZLIB",     "ZLIB",     "ZLIB_INCLUDE_DIRS",     "ZLIB_LIBRARIES",      nullptr      },
+		{ "zlib",       "zlib",              kSDLVersionAny, "FindZLIB",     "ZLIB",     "ZLIB_INCLUDE_DIRS",     "ZLIB_LIBRARIES",      nullptr      },
 		{ "png",        "libpng",            kSDLVersionAny, "FindPNG",      "PNG",      "PNG_INCLUDE_DIRS",      "PNG_LIBRARIES",       nullptr      },
 		{ "jpeg",       "libjpeg",           kSDLVersionAny, "FindJPEG",     "JPEG",     "JPEG_INCLUDE_DIRS",     "JPEG_LIBRARIES",      nullptr      },
 		{ "mpeg2",      "libmpeg2",          kSDLVersionAny, "FindMPEG2",    "MPEG2",    "MPEG2_INCLUDE_DIRS",    "MPEG2_mpeg2_LIBRARY", nullptr      },
diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index 87145ae9171..14183521405 100644
--- a/devtools/create_project/codeblocks.cpp
+++ b/devtools/create_project/codeblocks.cpp
@@ -58,8 +58,10 @@ StringList getFeatureLibraries(const BuildSetup &setup) {
 	for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
 		if (i->enable && i->library) {
 			std::string libname;
-			if (!std::strcmp(i->name, "libz") || !std::strcmp(i->name, "libcurl")) {
+			if (!std::strcmp(i->name, "libcurl")) {
 				libname = i->name;
+			} else if (!std::strcmp(i->name, "zlib")) {
+				libname = "libz";
 			} else if (!std::strcmp(i->name, "vorbis")) {
 				libname = "libvorbis";
 				libraries.push_back("libvorbisfile");
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 2af5a2aeb8d..5541edd642f 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1063,7 +1063,7 @@ namespace {
 // clang-format off
 const Feature s_features[] = {
 	// Libraries (must be added in generators)
-	{      "libz",        "USE_ZLIB", true, true,  "zlib (compression) support" },
+	{      "zlib",        "USE_ZLIB", true, true,  "zlib (compression) support" },
 	{       "mad",         "USE_MAD", true, true,  "libmad (MP3) support" },
 	{   "fribidi",     "USE_FRIBIDI", true, true,  "BiDi support" },
 	{       "ogg",         "USE_OGG", true, true,  "Ogg support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 8c68e6a87a8..56b3cfd1017 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -56,7 +56,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		// Libraries
 		{       "sdl", "SDL.lib",                   "SDLd.lib",      "winmm.lib imm32.lib version.lib setupapi.lib",    nullptr },
 		{      "sdl2", "SDL2.lib",                  "SDL2d.lib",     "winmm.lib imm32.lib version.lib setupapi.lib",    nullptr },
-		{      "libz", "zlib.lib",                  "zlibd.lib",     nullptr,                                           nullptr },
+		{      "zlib", "zlib.lib",                  "zlibd.lib",     nullptr,                                           nullptr },
 		{       "mad", "mad.lib",                   nullptr,         nullptr,                                           "libmad.lib" },
 		{   "fribidi", "fribidi.lib",               nullptr,         nullptr,                                           nullptr },
 		{       "ogg", "ogg.lib",                   nullptr,         nullptr,                                           "libogg_static.lib" },