diff --git a/CMakePresets.json b/CMakePresets.json index 412e331640..a420a85a60 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -25,6 +25,20 @@ "PrusaSlicer_DEPS_PRESET": "no-occt", "PrusaSlicer_DEPS_OUTPUT_QUIET": false } + }, + { + "name": "shareddeps", + "displayName": "Shared dependencies", + "description": "Building with dynamically linked dependencies from the system", + "binaryDir": "${sourceDir}/shareddeps", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "SLIC3R_STATIC": false, + "SLIC3R_GTK": "3", + "SLIC3R_ENC_CHECK": false, + "SLIC3R_PCH": true, + "PrusaSlicer_BUILD_DEPS": false + } } ] } \ No newline at end of file diff --git a/deps/+TIFF/TIFF.cmake b/deps/+TIFF/TIFF.cmake index eea89da385..9281dd5a6c 100644 --- a/deps/+TIFF/TIFF.cmake +++ b/deps/+TIFF/TIFF.cmake @@ -9,6 +9,7 @@ add_cmake_project(TIFF -Djbig:BOOL=OFF -Dzstd:BOOL=OFF -Dpixarlog:BOOL=OFF + -Dlibdeflate:BOOL=OFF ) set(DEP_TIFF_DEPENDS ZLIB PNG JPEG OpenGL) diff --git a/deps/CMakePresets.json b/deps/CMakePresets.json index d051c81de1..9edbe5f5c3 100644 --- a/deps/CMakePresets.json +++ b/deps/CMakePresets.json @@ -8,6 +8,7 @@ "binaryDir": "${sourceDir}/build-default", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", + "DEP_WX_GTK3": true, "DEP_DOWNLOAD_DIR": { "type": "PATH", "value": "${sourceDir}/.pkg_cache" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc23da212a..2ea3c31117 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -60,8 +60,8 @@ if (SLIC3R_GUI) message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}") endif() - find_package(JPEG QUIET) - find_package(TIFF QUIET) + find_package(JPEG MODULE QUIET) + find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build find_package(NanoSVG REQUIRED) string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 3f0b500c42..52a04721bd 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -756,7 +756,7 @@ ConfigSubstitutions ConfigBase::load(const std::string& filename, ForwardCompati if (file == nullptr) throw Slic3r::RuntimeError(format("Error opening file %1%", filename)); - std::vector cs_buffer(65536); + std::vector cs_buffer(65536); using namespace bgcode::core; file_type = (is_valid_binary_gcode(*file, true, cs_buffer.data(), cs_buffer.size()) == EResult::Success) ? EFileType::BinaryGCode : EFileType::AsciiGCode; fclose(file); @@ -1094,7 +1094,7 @@ ConfigSubstitutions ConfigBase::load_from_binary_gcode_file(const std::string& f using namespace bgcode::core; using namespace bgcode::binarize; - std::vector cs_buffer(65536); + std::vector cs_buffer(65536); EResult res = is_valid_binary_gcode(*file.f, true, cs_buffer.data(), cs_buffer.size()); if (res != EResult::Success) throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename,