Force the use of fontconfig fontmap backend on Windows

wesnoth · Jul 28, 2020 · ec67098 · ec67098
1 parent fa08ff2
commit ec67098
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/font/font_config.cpp b/src/font/font_config.cpp
@@ -40,7 +40,6 @@
 
 #ifdef CAIRO_HAS_WIN32_FONT
 #include <windows.h>
-#undef CAIRO_HAS_FT_FONT
 #endif
 
 #ifdef CAIRO_HAS_FT_FONT
@@ -239,9 +238,7 @@ manager::manager()
 	{
 		LOG_FT << "Local font configuration loaded\n";
 	}
-#endif
-
-#ifdef CAIRO_HAS_WIN32_FONT
+#elif defined(CAIRO_HAS_WIN32_FONT)
 	for(const std::string& path : filesystem::get_binary_paths("fonts")) {
 		std::vector<std::string> files;
 		if(filesystem::is_directory(path)) {

diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
@@ -1027,6 +1027,9 @@ int main(int argc, char** argv)
 	UNUSED(argc);
 	UNUSED(argv);
 
+	_putenv("PANGOCAIRO_BACKEND=fontconfig");
+	_putenv("FONTCONFIG_PATH=fonts");
+
 	// windows argv is ansi encoded by default
 	std::vector<std::string> args =
 		parse_commandline_arguments(unicode_cast<std::string>(std::wstring(GetCommandLineW())));