diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/AppConfig.cpp OrcaSlicer/src/libslic3r/AppConfig.cpp
--- OrcaSlicer_or/src/libslic3r/AppConfig.cpp	2024-08-07 20:51:23.931605968 +0200
+++ OrcaSlicer/src/libslic3r/AppConfig.cpp	2024-08-07 20:51:41.591397327 +0200
@@ -8,6 +8,7 @@
 #include "Thread.hpp"
 #include "format.hpp"
 #include "nlohmann/json.hpp"
+#include "format.hpp"
 
 #include <utility>
 #include <vector>
diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/GCode/Thumbnails.cpp OrcaSlicer/src/libslic3r/GCode/Thumbnails.cpp
--- OrcaSlicer_or/src/libslic3r/GCode/Thumbnails.cpp	2024-08-07 20:51:23.931605968 +0200
+++ OrcaSlicer/src/libslic3r/GCode/Thumbnails.cpp	2024-08-07 20:51:41.594730621 +0200
@@ -1,4 +1,6 @@
 #include "Thumbnails.hpp"
+#include "format.hpp"
+#include <boost/algorithm/string.hpp>
 #include "../miniz_extension.hpp"
 #include "format.hpp"
 
diff '--color=auto' -Naur OrcaSlicer_or/src/libslic3r/PrintConfig.cpp OrcaSlicer/src/libslic3r/PrintConfig.cpp
--- OrcaSlicer_or/src/libslic3r/PrintConfig.cpp	2024-08-07 20:51:23.934939261 +0200
+++ OrcaSlicer/src/libslic3r/PrintConfig.cpp	2024-08-07 20:51:41.594730621 +0200
@@ -5,6 +5,7 @@
 #include "format.hpp"
 
 #include "GCode/Thumbnails.hpp"
+#include "format.hpp"
 #include <set>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
diff '--color=auto' -Naur OrcaSlicer_or/src/slic3r/Config/Version.cpp OrcaSlicer/src/slic3r/Config/Version.cpp
--- OrcaSlicer_or/src/slic3r/Config/Version.cpp	2024-08-07 20:51:23.938272555 +0200
+++ OrcaSlicer/src/slic3r/Config/Version.cpp	2024-08-07 20:51:41.598063915 +0200
@@ -3,6 +3,7 @@
 #include <cctype>
 
 #include <boost/filesystem/operations.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/nowide/fstream.hpp>
 
 #include "libslic3r/libslic3r.h"
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt	2024-08-07 21:02:29.347237569 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt	2024-08-07 22:16:05.859877170 +0200
@@ -520,11 +520,7 @@
 find_package(JPEG REQUIRED)
 
 set(OCCT_LIBS
-    TKXDESTEP
-    TKSTEP
-    TKSTEP209
-    TKSTEPAttr
-    TKSTEPBase
+    TKDESTEP
     TKXCAF
     TKXSBase
     TKVCAF
@@ -573,7 +573,7 @@
     mcut
     JPEG::JPEG
     qoi
-    opencv_world
+    opencv_gapi
     )
 
 if(NOT WIN32)
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt	2024-08-08 17:56:36.349505920 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt	2024-08-08 18:30:15.871738122 +0200
@@ -507,6 +507,7 @@
 if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
     target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)
 endif ()
+target_compile_definitions(libslic3r_cgal PRIVATE BOOST_ALL_DYN_LINK)
 
 encoding_check(libslic3r)
 
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/libslic3r/CMakeLists.txt	2024-08-08 17:56:36.349505920 +0200
+++ OrcaSlicer-2.1.1/src/libslic3r/CMakeLists.txt	2024-08-08 18:47:26.687872804 +0200
@@ -602,3 +603,7 @@
 if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
     add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
 endif ()
+
+if (NOT SLIC3R_STATIC)
+    install(TARGETS libslic3r_cgal DESTINATION ${CMAKE_INSTALL_DIR})
+endif()
diff '--color=auto' -Naur OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt
--- OrcaSlicer-2.1.1_or/src/slic3r/CMakeLists.txt	2024-08-08 17:56:36.356172509 +0200
+++ OrcaSlicer-2.1.1/src/slic3r/CMakeLists.txt	2024-08-08 18:48:15.594033021 +0200
@@ -677,3 +677,7 @@
 
 # Add a definition so that we can tell we are compiling slic3r.
 target_compile_definitions(libslic3r_gui PRIVATE SLIC3R_CURRENTLY_COMPILING_GUI_MODULE)
+
+if (NOT SLIC3R_STATIC)
+    install(TARGETS libslic3r_gui DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp OrcaSlicer-nightly-builds/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp
--- OrcaSlicer-nightly-builds_or/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp	2024-08-08 19:41:14.965987153 +0200
+++ OrcaSlicer-nightly-builds/src/libslic3r/Arachne/SkeletalTrapezoidationGraph.cpp	2024-08-08 19:45:58.583011102 +0200
@@ -6,6 +6,7 @@
 
 
 #include <boost/log/trivial.hpp>
+#include "../Line.hpp"
 
 namespace Slic3r::Arachne
 {
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/libslic3r/utils.cpp OrcaSlicer-nightly-builds/src/libslic3r/utils.cpp
--- OrcaSlicer-nightly-builds_or/src/libslic3r/utils.cpp	2024-08-08 19:41:14.972653748 +0200
+++ OrcaSlicer-nightly-builds/src/libslic3r/utils.cpp	2024-08-08 19:43:07.831462664 +0200
@@ -5,6 +5,7 @@
 #include <locale>
 #include <cstdarg>
 #include <stdio.h>
+#include <boost/nowide/cstdio.hpp>
 
 #include "format.hpp"
 #include "libslic3r.h"
diff '--color=auto' -Naur OrcaSlicer-nightly-builds_or/src/slic3r/GUI/Preferences.cpp OrcaSlicer-nightly-builds/src/slic3r/GUI/Preferences.cpp
--- OrcaSlicer-nightly-builds_or/src/slic3r/GUI/Preferences.cpp	2024-08-08 19:41:14.975987047 +0200
+++ OrcaSlicer-nightly-builds/src/slic3r/GUI/Preferences.cpp	2024-08-08 19:58:02.008908684 +0200
@@ -16,6 +16,7 @@
 #include "Widgets/RadioBox.hpp"
 #include "Widgets/TextInput.hpp"
 #include <wx/listimpl.cpp>
+#include <wx/display.h>
 #include <map>
 
 #ifdef __WINDOWS__