[Scummvm-git-logs] scummvm master -> 52dcac9fc6b71f7740fd7677e704a0e82316b237

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0011ad97cb CREATE_PROJECT: Add a warning when the feature is not found
52dcac9fc6 CREATE_PROJECT: Fix theoradec feature name


Commit: 0011ad97cb98a8604ed4b8f16a83d4f0e4b66b66
    https://github.com/scummvm/scummvm/commit/0011ad97cb98a8604ed4b8f16a83d4f0e4b66b66
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-01-09T17:28:17+01:00

Commit Message:
CREATE_PROJECT: Add a warning when the feature is not found

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 8e5693124bb..90a0f6c580d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -343,7 +343,9 @@ int main(int argc, char *argv[]) {
 		if (i->enable) {
 			for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
 				FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
-				if (feature != setup.features.end() && !feature->enable) {
+				if (feature == setup.features.end()) {
+					std::cerr << "WARNING: Missing feature " << *ef << " from engine " << i->name << '\n';
+				} else if (!feature->enable) {
 					setEngineBuildState(i->name, setup.engines, false);
 					break;
 				}


Commit: 52dcac9fc6b71f7740fd7677e704a0e82316b237
    https://github.com/scummvm/scummvm/commit/52dcac9fc6b71f7740fd7677e704a0e82316b237
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-01-09T17:28:17+01:00

Commit Message:
CREATE_PROJECT: Fix theoradec feature name

This is needed by sword25

Changed paths:
    devtools/create_project/cmake.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 56993c621b2..7fb2369ba50 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -47,7 +47,7 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 		{ "ogg",        "ogg",               kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "ogg"        },
 		{ "vorbis",     "vorbisfile vorbis", kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "vorbisfile vorbis" },
 		{ "tremor",     "vorbisidec",        kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "vorbisidec" },
-		{ "theora",     "theoradec",         kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "theoradec"  },
+		{ "theoradec",  "theoradec",         kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "theoradec"  },
 		{ "fluidsynth", "fluidsynth",        kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "fluidsynth" },
 		{ "faad",       "faad2",             kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "faad"       },
 		{ "fribidi",    "fribidi",           kSDLVersionAny, nullptr,        nullptr,    nullptr,                 nullptr,               "fribidi"    },
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 90a0f6c580d..d93468eff85 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1076,7 +1076,7 @@ const Feature s_features[] = {
 	{       "gif",         "USE_GIF", true, false, "libgif support" },
 	{      "faad",        "USE_FAAD", true, false, "AAC support" },
 	{     "mpeg2",       "USE_MPEG2", true, true,  "MPEG-2 support" },
-	{    "theora",   "USE_THEORADEC", true, true,  "Theora decoding support" },
+	{ "theoradec",   "USE_THEORADEC", true, true,  "Theora decoding support" },
 	{ "freetype2",   "USE_FREETYPE2", true, true,  "FreeType support" },
 	{      "jpeg",        "USE_JPEG", true, true,  "libjpeg support" },
 	{"fluidsynth",  "USE_FLUIDSYNTH", true, true,  "FluidSynth support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index b10affd7db7..81b149688b2 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -66,7 +66,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		{       "gif", "gif.lib",                   nullptr,         nullptr,                                           nullptr },
 		{      "faad", "faad.lib",                  nullptr,         nullptr,                                           "libfaad.lib" },
 		{     "mpeg2", "mpeg2.lib",                 nullptr,         nullptr,                                           "libmpeg2.lib" },
-		{    "theora", "theora.lib",                nullptr,         nullptr,                                           "libtheora_static.lib" },
+		{ "theoradec", "theora.lib",                nullptr,         nullptr,                                           "libtheora_static.lib" },
 		{ "freetype2", "freetype.lib",              "freetyped.lib", nullptr,                                           nullptr },
 		{      "jpeg", "jpeg.lib",                  nullptr,         nullptr,                                           "jpeg-static.lib" },
 		{"fluidsynth", "fluidsynth.lib",            nullptr,         nullptr,                                           "libfluidsynth.lib" },