diff --git a/deps/FREETYPE/FREETYPE.cmake b/deps/FREETYPE/FREETYPE.cmake
index c8aa400a2..714df28cf 100644
--- a/deps/FREETYPE/FREETYPE.cmake
+++ b/deps/FREETYPE/FREETYPE.cmake
@@ -4,6 +4,12 @@ else()
     set(library_build_shared "0")
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(_ft_disable_zlib "-D FT_DISABLE_ZLIB=FALSE")
+else()
+    set(_ft_disable_zlib "-D FT_DISABLE_ZLIB=TRUE")
+endif()
+
 bambustudio_add_cmake_project(FREETYPE
     URL https://mirror.ossplanet.net/nongnu/freetype/freetype-2.12.1.tar.gz
     URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
@@ -11,7 +17,7 @@ bambustudio_add_cmake_project(FREETYPE
     #"${_patch_step}"
     CMAKE_ARGS
 	-D BUILD_SHARED_LIBS=${library_build_shared}
-        -D FT_DISABLE_ZLIB=TRUE
+	${_ft_disable_zlib}
         -D FT_DISABLE_BZIP2=TRUE
         -D FT_DISABLE_PNG=TRUE
         -D FT_DISABLE_HARFBUZZ=TRUE
diff --git a/deps/GLFW/GLFW.cmake b/deps/GLFW/GLFW.cmake
index 150245976..d6a7384d1 100644
--- a/deps/GLFW/GLFW.cmake
+++ b/deps/GLFW/GLFW.cmake
@@ -6,6 +6,12 @@ else()
     set(_build_static ON)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=ON")
+else()
+    set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=FF")
+endif()
+
 bambustudio_add_cmake_project(GLFW
     URL https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip
     URL_HASH SHA256=e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0
@@ -14,9 +20,10 @@ bambustudio_add_cmake_project(GLFW
         -DBUILD_SHARED_LIBS=${_build_shared} 
         -DGLFW_BUILD_DOCS=OFF
         -DGLFW_BUILD_EXAMPLES=OFF
-		-DGLFW_BUILD_TESTS=OFF
+	-DGLFW_BUILD_TESTS=OFF
+	${_glfw_use_wayland}
 )
 
 if (MSVC)
     add_debug_dep(dep_GLFW)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index c6f01a65d..dbb79a1d8 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -454,10 +454,6 @@ set(OCCT_LIBS
     TKernel
 )
 
-if(APPLE)
-    target_link_libraries(libslic3r freetype)
-endif()
-
 
 target_link_libraries(libslic3r
     libnest2d
@@ -480,6 +476,13 @@ target_link_libraries(libslic3r
     ${OCCT_LIBS}
     )
 
+if(NOT WIN32)
+    target_link_libraries(libslic3r freetype)
+    if (NOT APPLE)
+        target_link_libraries(libslic3r fontconfig)
+    endif()
+endif()
+
 if (TARGET OpenVDB::openvdb)
     target_link_libraries(libslic3r OpenVDB::openvdb)
 endif()