Browse Source

Trying to fix PS build after deps update

tamasmeszaros 1 year ago
parent
commit
035406b0af
5 changed files with 20 additions and 4 deletions
  1. 14 0
      CMakePresets.json
  2. 1 0
      deps/+TIFF/TIFF.cmake
  3. 1 0
      deps/CMakePresets.json
  4. 2 2
      src/CMakeLists.txt
  5. 2 2
      src/libslic3r/Config.cpp

+ 14 - 0
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
+            }
         }
     ]
 }

+ 1 - 0
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)

+ 1 - 0
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"

+ 2 - 2
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})

+ 2 - 2
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<uint8_t> cs_buffer(65536);
+        std::vector<std::byte> 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<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());
     if (res != EResult::Success)
         throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename,