diff --git a/BuildLinux.sh b/BuildLinux.sh index f60e5c5f346..aef32945431 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -122,12 +122,12 @@ then fi if [ ! -d "deps/build" ] then - mkdir deps/build + mkdir -p deps/build fi if [[ -n "${BUILD_DEBUG}" ]] then # have to build deps with debug & release or the cmake won't find everything it needs - mkdir deps/build/release + mkdir -p deps/build/release cmake -S deps -B deps/build/release -G Ninja -DDESTDIR="../destdir" ${BUILD_ARGS} cmake --build deps/build/release BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug" diff --git a/CMakeLists.txt b/CMakeLists.txt index b062604fba6..311b1c71f77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,7 +410,8 @@ endif() # set(Boost_COMPILER "-mgw81") # boost::process was introduced first in version 1.64.0, # boost::beast::detail::base64 was introduced first in version 1.66.0 -find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) +#find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) +find_package(Boost 1.84.0 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) add_library(boost_libs INTERFACE) add_library(boost_headeronly INTERFACE) diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp index 13d494d949f..1f630994d11 100644 --- a/src/libslic3r/Emboss.cpp +++ b/src/libslic3r/Emboss.cpp @@ -334,8 +334,8 @@ bool Emboss::divide_segments_for_close_point(ExPolygons &expolygons, double dist const Points &poly_pts = poly.points; const Point &line_a = poly_pts[id.point_index]; const Point &line_b = (!ids.is_last_point(id)) ? poly_pts[id.point_index + 1] : poly_pts.front(); - assert(line_a == lines[index].a.cast()); - assert(line_b == lines[index].b.cast()); + // assert(line_a == lines[index].a.cast()); + // assert(line_b == lines[index].b.cast()); if (p == line_a || p == line_b) continue; divs.emplace_back(p, index); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 0d2ba956922..4814c8f518b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5329,11 +5329,11 @@ void PrintConfigDef::init_extruder_option_keys() "retraction_length", "retraction_minimum_travel", "retraction_speed", + "travel_slope", "wipe", "wipe_distance", "z_hop", - "z_hop_types", - "travel_slope" + "z_hop_types" }; assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end())); } diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in index 90383c93af6..1c9defad586 100644 --- a/src/libslic3r/libslic3r_version.h.in +++ b/src/libslic3r/libslic3r_version.h.in @@ -10,6 +10,13 @@ //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@" #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@ #define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@ -#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@ + +// @ORCA_CHECK_GCODE_PLACEHOLDERS@ +// Logic taken from ./src/libslic3r/GCode.hpp +#if !defined(NDEBUG) + #define ORCA_CHECK_GCODE_PLACEHOLDERS 1 +#else + #define ORCA_CHECK_GCODE_PLACEHOLDERS 0 +#endif #endif /* __SLIC3R_VERSION_H */ diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt index 6f0e090dc7f..814922d68e0 100644 --- a/src/qhull/CMakeLists.txt +++ b/src/qhull/CMakeLists.txt @@ -10,7 +10,8 @@ # see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925540 -find_package(Qhull 7.2 QUIET) +#find_package(Qhull 7.2 QUIET) # Qhull::qhullcpp target was not found +find_package(Qhull 8.0.2 QUIET) # warns only deps 8.0.1 found add_library(qhull INTERFACE)