[Scummvm-git-logs] scummvm master -> 8119ae19c0ee823fd972cecc1608be9d328ada95

[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:
8119ae19c0 CREATE_PROJECT: Fix feature name for freetype


Commit: 8119ae19c0ee823fd972cecc1608be9d328ada95
    https://github.com/scummvm/scummvm/commit/8119ae19c0ee823fd972cecc1608be9d328ada95
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-01-09T18:27:24+02:00

Commit Message:
CREATE_PROJECT: Fix feature name for freetype

The name was inconsistent with the main build system

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 6aa6dec9ba3..56993c621b2 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -37,7 +37,7 @@ const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *f
 	static const Library s_libraries[] = {
 		{ "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      },
+		{ "freetype2",  "freetype2",         kSDLVersionAny, "FindFreetype", "Freetype", "FREETYPE_INCLUDE_DIRS", "FREETYPE_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      },
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 5541edd642f..8e5693124bb 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1075,7 +1075,7 @@ const Feature s_features[] = {
 	{      "faad",        "USE_FAAD", true, false, "AAC support" },
 	{     "mpeg2",       "USE_MPEG2", true, true,  "MPEG-2 support" },
 	{    "theora",   "USE_THEORADEC", true, true,  "Theora decoding support" },
-	{  "freetype",   "USE_FREETYPE2", true, true,  "FreeType support" },
+	{ "freetype2",   "USE_FREETYPE2", true, true,  "FreeType support" },
 	{      "jpeg",        "USE_JPEG", true, true,  "libjpeg support" },
 	{"fluidsynth",  "USE_FLUIDSYNTH", true, true,  "FluidSynth support" },
 	{ "fluidlite",   "USE_FLUIDLITE", true, false, "FluidLite support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 56b3cfd1017..b10affd7db7 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -67,7 +67,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		{      "faad", "faad.lib",                  nullptr,         nullptr,                                           "libfaad.lib" },
 		{     "mpeg2", "mpeg2.lib",                 nullptr,         nullptr,                                           "libmpeg2.lib" },
 		{    "theora", "theora.lib",                nullptr,         nullptr,                                           "libtheora_static.lib" },
-		{  "freetype", "freetype.lib",              "freetyped.lib", nullptr,                                           nullptr },
+		{ "freetype2", "freetype.lib",              "freetyped.lib", nullptr,                                           nullptr },
 		{      "jpeg", "jpeg.lib",                  nullptr,         nullptr,                                           "jpeg-static.lib" },
 		{"fluidsynth", "fluidsynth.lib",            nullptr,         nullptr,                                           "libfluidsynth.lib" },
 		{ "fluidlite", "fluidlite.lib",             nullptr,         nullptr,                                           nullptr },