diff --git a/conanfile.py b/conanfile.py index 10e1bfa..cc1f6e8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,6 +33,22 @@ class CompressorRecipe(ConanFile): "use_system_libwebp": False, # There's a problem compiling libwebp with emscripten in conan "use_conan_libwebp": False }) + elif self.settings.os == "Windows": + self.requires("skia/143.20251028.0", options = { + "use_system_expat": False, + "use_freetype": False, + "use_system_harfbuzz": True, + "use_conan_harfbuzz": True, + "use_system_icu": True, + "use_conan_icu": True, + "use_system_libjpeg_turbo": False, + "use_system_libpng": False, + "use_system_libwebp": False, + "use_system_zlib": False, + "enable_svg": True, + "enable_skottie": False, + "enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project + }) else: self.requires("skia/143.20251028.0", options = { "use_system_expat": False, diff --git a/src/FontData.cpp b/src/FontData.cpp index 047dc82..13d534c 100644 --- a/src/FontData.cpp +++ b/src/FontData.cpp @@ -1,13 +1,16 @@ #include "FontData.hpp" -#include #include #include #include #include -#ifndef __EMSCRIPTEN__ +#ifdef __EMSCRIPTEN__ + #include +#elif _WIN32 +#else #include #include + #include #endif #include @@ -16,11 +19,15 @@ FontData::FontData() { #ifdef __EMSCRIPTEN__ localFontMgr = SkFontMgr_New_Custom_Empty(); + defaultFontMgr = SkFontMgr_New_Custom_Directory("data/fonts"); +#elif _WIN32 + localFontMgr = SkFontMgr_New_Custom_Empty(); + defaultFontMgr = SkFontMgr_New_Custom_Empty(); #else localFontMgr = SkFontMgr_New_FontConfig(nullptr, SkFontScanner_Make_FreeType()); + defaultFontMgr = SkFontMgr_New_Custom_Directory("data/fonts"); #endif - defaultFontMgr = SkFontMgr_New_Custom_Directory("data/fonts"); map["Roboto"] = defaultFontMgr->makeFromFile("data/fonts/Roboto-variable.ttf");