New dicord / superslicer update

2024-07-02 11:21:31 +02:00
parent 7cfa23e0e8
commit c6c09f00c0
11 changed files with 93 additions and 39 deletions
@@ -0,0 +1,15 @@
+diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/CMakeLists.txt OrcaSlicer-2.0.0/CMakeLists.txt
+--- OrcaSlicer-2.0.0.orig/CMakeLists.txt	2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/CMakeLists.txt	2024-06-28 14:36:37.343289495 +0200
+@@ -71,6 +71,11 @@
+ option(SLIC3R_BUILD_TESTS       "Build unit tests" OFF)
+ option(ORCA_TOOLS       "Build Orca tools" OFF)
+ 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK")
+
+ if (IS_CROSS_COMPILE)
+     message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
+     set(SLIC3R_PERL_XS OFF CACHE BOOL "" FORCE)
@@ -0,0 +1,17 @@
+diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/libslic3r/CMakeLists.txt OrcaSlicer-2.0.0/src/libslic3r/CMakeLists.txt
+--- OrcaSlicer-2.0.0.orig/src/libslic3r/CMakeLists.txt	2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/src/libslic3r/CMakeLists.txt	2024-06-26 21:55:05.757147680 +0200
+@@ -517,11 +517,8 @@
+ find_package(JPEG REQUIRED)
+ 
+ set(OCCT_LIBS
+-    TKXDESTEP
+-    TKSTEP
+-    TKSTEP209
+-    TKSTEPAttr
+-    TKSTEPBase
+    TKDESTEP
+    TKDESTL
+     TKXCAF
+     TKXSBase
+     TKVCAF
@@ -0,0 +1,20 @@
+diff '--color=auto' -urN OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI.cpp OrcaSlicer-2.0.0/src/slic3r/GUI/GUI.cpp
+--- OrcaSlicer-2.0.0.orig/src/slic3r/GUI/GUI.cpp	2024-03-30 03:10:30.000000000 +0100
+++ OrcaSlicer-2.0.0/src/slic3r/GUI/GUI.cpp	2024-06-28 10:28:35.591515129 +0200
+@@ -36,6 +36,16 @@
+ 
+ namespace GUI {
+ 
+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
+#ifdef __WXGTK3__
+struct ForceX11 {
+    ForceX11() {
+        setenv("GDK_BACKEND", "x11", 1);
+    }
+};
+static struct ForceX11 forcex11;
+#endif
+
+ #if __APPLE__
+ IOPMAssertionID assertionID;
+ #endif