From 2ed08e68c35ab34ec3941eae9bb4fbb1006947cb Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Wed, 13 Oct 2021 11:57:58 +0200 Subject: [PATCH] add dependency on FontConfig for linux --- src/slic3r/CMakeLists.txt | 2 +- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index a0a6eeb796..401f5ba5cf 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -288,5 +288,5 @@ endif () if (UNIX AND NOT APPLE) find_package(GTK${SLIC3R_GTK} REQUIRED) target_include_directories(libslic3r_gui PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS}) - target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES}) + target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig) endif () diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 74be45ddc9..d316be15cd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -33,10 +33,16 @@ #define USE_FONT_DIALOG #endif // apple -#ifdef __linux__ +#ifdef __linux__ +//#ifdef __WXGTK__ +#define FontConfigExist +#endif + +#ifdef FontConfigExist #include #include -#endif // __linux__ +#define USE_FONT_DIALOG +#endif // FontConfigExist #ifdef _WIN32 #define USE_FONT_DIALOG @@ -76,7 +82,7 @@ public: static ExPolygons to_ExPolygons(NSVGimage *image, float tessTol = 10., int max_level = 10); }; -#ifdef __linux__ +#ifdef FontConfigExist class FontConfigHelp { public: @@ -169,7 +175,7 @@ public: return std::string(fullFileName.c_str()); } }; -#endif // __linux__ +#endif // FontConfigExist } // namespace Slic3r @@ -1079,7 +1085,7 @@ std::optional WxFontUtils::load_font(const wxFont &font) if (!font.IsOk()) return {}; #ifdef _WIN32 return Emboss::load_font(font.GetHFONT()); -#elif __linux__ // if defined(__WXGTK__) +#elif FontConfigExist static FontConfigHelp help; std::string font_path = help.get_font_path(font); if (font_path.empty()) return {};