Benjamin Greiner
4a9b0e7ed0
- Fixed loading STEP files - Added PrusaSlicer-2.8.1-pr13761-fix-occtwrapper.patch - Removed up-occt-version.patch OBS-URL: https://build.opensuse.org/request/show/1231393 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=89
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From ac3e07ee03b439932b9f7b00849ca202602f8901 Mon Sep 17 00:00:00 2001
|
|
From: randomtechguy <50642148+Rose-David@users.noreply.github.com>
|
|
Date: Fri, 12 Jul 2024 17:24:16 -0400
|
|
Subject: [PATCH 1/3] Update CMakeLists.txt to fix linux compile error
|
|
|
|
---
|
|
src/slic3r/CMakeLists.txt | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/CMakeLists.txt
|
|
+++ PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
|
|
@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
|
|
)
|
|
|
|
find_package(NanoSVG REQUIRED)
|
|
+find_package(OpenSSL REQUIRED)
|
|
|
|
if (APPLE)
|
|
list(APPEND SLIC3R_GUI_SOURCES
|
|
@@ -404,7 +405,7 @@ endforeach()
|
|
|
|
encoding_check(libslic3r_gui)
|
|
|
|
-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
|
|
+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
|
|
|
|
if (MSVC)
|
|
target_link_libraries(libslic3r_gui Setupapi.lib)
|
|
Index: PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/Config/Version.cpp
|
|
+++ PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
|
|
@@ -7,6 +7,7 @@
|
|
#include <cctype>
|
|
|
|
#include <boost/filesystem/operations.hpp>
|
|
+#include <boost/filesystem/directory.hpp>
|
|
#include <boost/nowide/fstream.hpp>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
+++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
|
|
@@ -13,6 +13,7 @@
|
|
#include <boost/filesystem.hpp>
|
|
#include <boost/nowide/cstdio.hpp>
|
|
#include <boost/nowide/fstream.hpp>
|
|
+#include <boost/nowide/convert.hpp>
|
|
#include <curl/curl.h>
|
|
#include <string>
|
|
|