Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/fix compiling #6

Merged
merged 8 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BuildLinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/libslic3r/Emboss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>());
assert(line_b == lines[index].b.cast<int>());
// assert(line_a == lines[index].a.cast<int>());
// assert(line_b == lines[index].b.cast<int>());
if (p == line_a || p == line_b) continue;

divs.emplace_back(p, index);
Expand Down
4 changes: 2 additions & 2 deletions src/libslic3r/PrintConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
Expand Down
9 changes: 8 additions & 1 deletion src/libslic3r/libslic3r_version.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
3 changes: 2 additions & 1 deletion src/qhull/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down