GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 06:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trying to fix PS build after deps update

Browse Source
This commit is contained in:
tamasmeszaros 2023-10-26 12:37:33 +02:00
parent 2e4ce6e283
commit 035406b0af
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakePresets.json
View File

@ -25,6 +25,20 @@
"PrusaSlicer_DEPS_PRESET": "no-occt", "PrusaSlicer_DEPS_PRESET": "no-occt",
"PrusaSlicer_DEPS_OUTPUT_QUIET": false "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
}
} }
] ]
} }

1
deps/+TIFF/TIFF.cmake vendored
View File

@ -9,6 +9,7 @@ add_cmake_project(TIFF
-Djbig:BOOL=OFF -Djbig:BOOL=OFF
-Dzstd:BOOL=OFF -Dzstd:BOOL=OFF
-Dpixarlog:BOOL=OFF -Dpixarlog:BOOL=OFF
-Dlibdeflate:BOOL=OFF
) )
set(DEP_TIFF_DEPENDS ZLIB PNG JPEG OpenGL) set(DEP_TIFF_DEPENDS ZLIB PNG JPEG OpenGL)

1
deps/CMakePresets.json vendored
View File

@ -8,6 +8,7 @@
"binaryDir": "${sourceDir}/build-default", "binaryDir": "${sourceDir}/build-default",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release",
"DEP_WX_GTK3": true,
"DEP_DOWNLOAD_DIR": { "DEP_DOWNLOAD_DIR": {
"type": "PATH", "type": "PATH",
"value": "${sourceDir}/.pkg_cache" "value": "${sourceDir}/.pkg_cache"

4
src/CMakeLists.txt
View File

@ -60,8 +60,8 @@ if (SLIC3R_GUI)
message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}") message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
endif() endif()
find_package(JPEG QUIET) find_package(JPEG MODULE QUIET)
find_package(TIFF QUIET) find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build
find_package(NanoSVG REQUIRED) find_package(NanoSVG REQUIRED)
string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})

4
src/libslic3r/Config.cpp
View File

@ -756,7 +756,7 @@ ConfigSubstitutions ConfigBase::load(const std::string& filename, ForwardCompati
if (file == nullptr) if (file == nullptr)
throw Slic3r::RuntimeError(format("Error opening file %1%", filename)); throw Slic3r::RuntimeError(format("Error opening file %1%", filename));
std::vector<uint8_t> cs_buffer(65536); std::vector<std::byte> cs_buffer(65536);
using namespace bgcode::core; using namespace bgcode::core;
file_type = (is_valid_binary_gcode(*file, true, cs_buffer.data(), cs_buffer.size()) == EResult::Success) ? EFileType::BinaryGCode : EFileType::AsciiGCode; file_type = (is_valid_binary_gcode(*file, true, cs_buffer.data(), cs_buffer.size()) == EResult::Success) ? EFileType::BinaryGCode : EFileType::AsciiGCode;
fclose(file); fclose(file);
@ -1094,7 +1094,7 @@ ConfigSubstitutions ConfigBase::load_from_binary_gcode_file(const std::string& f
using namespace bgcode::core; using namespace bgcode::core;
using namespace bgcode::binarize; using namespace bgcode::binarize;
std::vector<uint8_t> cs_buffer(65536); std::vector<std::byte> cs_buffer(65536);
EResult res = is_valid_binary_gcode(*file.f, true, cs_buffer.data(), cs_buffer.size()); EResult res = is_valid_binary_gcode(*file.f, true, cs_buffer.data(), cs_buffer.size());
if (res != EResult::Success) if (res != EResult::Success)
throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename, throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename,