diff --git a/deps/Assimp/Assimp.cmake b/deps/Assimp/Assimp.cmake
index 1c38b33991..3cce3339d5 100644
--- a/deps/Assimp/Assimp.cmake
+++ b/deps/Assimp/Assimp.cmake
@@ -11,7 +11,7 @@ bambustudio_add_cmake_project(Assimp
         -DASSIMP_BUILD_GLTF_IMPORTER=ON
         -DASSIMP_BUILD_OBJ_IMPORTER=ON
         -DASSIMP_BUILD_FBX_IMPORTER=ON
-        -DASSIMP_BUILD_ZLIB=ON
+        -DASSIMP_BUILD_ZLIB=OFF
         -DASSIMP_WARNINGS_AS_ERRORS=OFF
         -DBUILD_WITH_STATIC_CRT=OFF
 )
diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake
index 42afc623d4..5051afe95e 100644
--- a/deps/deps-macos.cmake
+++ b/deps/deps-macos.cmake
@@ -11,6 +11,7 @@ set(DEP_CMAKE_OPTS
     "-DCMAKE_C_FLAGS=${DEP_WERRORS_SDK}"
     "-DCMAKE_FIND_FRAMEWORK=LAST"
     "-DCMAKE_FIND_APPBUNDLE=LAST"
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
 )
 
 include("deps-unix-common.cmake")
diff --git a/src/clipper2/CMakeLists.txt b/src/clipper2/CMakeLists.txt
index 2245f197dd..6121d6fdf1 100644
--- a/src/clipper2/CMakeLists.txt
+++ b/src/clipper2/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(Clipper2
 if (WIN32)
   target_compile_options(Clipper2 PRIVATE /W4 /WX)
 else()
-  target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
+  target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-unknown-warning-option)
   target_link_libraries(Clipper2 PUBLIC -lm)
   if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14.1)
     target_compile_options(Clipper2 PRIVATE -Wno-error=template-id-cdtor)
diff --git a/src/slic3r/GUI/MediaPlayCtrl.h b/src/slic3r/GUI/MediaPlayCtrl.h
index 67287b7ac1..95372e655b 100644
--- a/src/slic3r/GUI/MediaPlayCtrl.h
+++ b/src/slic3r/GUI/MediaPlayCtrl.h
@@ -89,10 +89,10 @@ class MediaPlayCtrl : public wxPanel
     static bool get_stream_url(std::string *url = nullptr);
 
 private:
-    static constexpr wxMediaState MEDIASTATE_IDLE = (wxMediaState) 3;
-    static constexpr wxMediaState MEDIASTATE_INITIALIZING = (wxMediaState) 4;
-    static constexpr wxMediaState MEDIASTATE_LOADING = (wxMediaState) 5;
-    static constexpr wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
+    static const wxMediaState MEDIASTATE_IDLE = (wxMediaState) 3;
+    static const wxMediaState MEDIASTATE_INITIALIZING = (wxMediaState) 4;
+    static const wxMediaState MEDIASTATE_LOADING = (wxMediaState) 5;
+    static const wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
 
     // token
     std::shared_ptr<int> m_token = std::make_shared<int>(0);
diff --git a/src/slic3r/GUI/wxMediaCtrl2.h b/src/slic3r/GUI/wxMediaCtrl2.h
index 4e81b1a78b..ca748e7c6a 100644
--- a/src/slic3r/GUI/wxMediaCtrl2.h
+++ b/src/slic3r/GUI/wxMediaCtrl2.h
@@ -39,7 +39,7 @@ class wxMediaCtrl2 : public wxWindow
 
     int GetLastError() const { return m_error; }
 
-    static constexpr wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
+    static const wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
 
 protected:
     void DoSetSize(int x, int y, int width, int height, int sizeFlags) override;