Force the use of fontconfig fontmap backend on Windows

Wedge009 · Jun 11, 2022 · 06b0247 · 06b0247
1 parent e0504dc
commit 06b0247
Show file tree

Hide file tree

Showing 2 changed files with 5 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
@@ -198,9 +197,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
@@ -997,6 +997,10 @@ int main(int argc, char** argv)
 	bool log_redirect = true, native_console_implied = false;
 	// This is optional<bool> instead of tribool because value_or() is exactly the required semantic
 	std::optional<bool> native_console_force;
+
+	_putenv("PANGOCAIRO_BACKEND=fontconfig");
+	_putenv("FONTCONFIG_PATH=fonts");
+
 	// Some switches force a Windows console to be attached to the process even
 	// if Wesnoth is an IMAGE_SUBSYSTEM_WINDOWS_GUI executable because they
 	// turn it into a CLI application. Also, --wconsole in particular attaches