diff --git a/src/libseqarrange/include/seq_interface.hpp b/src/libseqarrange/include/seq_interface.hpp index b1cdf0fa20..12b6730225 100644 --- a/src/libseqarrange/include/seq_interface.hpp +++ b/src/libseqarrange/include/seq_interface.hpp @@ -16,7 +16,7 @@ /*----------------------------------------------------------------*/ #include "libslic3r/Polygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "seq_defs.hpp" @@ -43,7 +43,7 @@ struct PrinterGeometry std::set convex_heights; std::set box_heights; - std::map > extruder_slices; + std::map > extruder_slices; }; @@ -106,7 +106,7 @@ struct ObjectToPrint { int id = 0; coord_t total_height = 0; - std::vector> pgns_at_height; + std::vector> pgns_at_height; }; diff --git a/src/libseqarrange/include/seq_sequential.hpp b/src/libseqarrange/include/seq_sequential.hpp index 6a1f1a518a..3c2d2df691 100644 --- a/src/libseqarrange/include/seq_sequential.hpp +++ b/src/libseqarrange/include/seq_sequential.hpp @@ -25,7 +25,7 @@ #include "libslic3r/Geometry.hpp" #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include diff --git a/src/libseqarrange/src/sequential_decimator.cpp b/src/libseqarrange/src/sequential_decimator.cpp index 2e69caca53..c184323187 100644 --- a/src/libseqarrange/src/sequential_decimator.cpp +++ b/src/libseqarrange/src/sequential_decimator.cpp @@ -15,7 +15,7 @@ #include #include "libslic3r/Polygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include "seq_version.hpp" diff --git a/src/libseqarrange/src/sequential_prusa.cpp b/src/libseqarrange/src/sequential_prusa.cpp index 43e9d43c24..f00bb66b62 100644 --- a/src/libseqarrange/src/sequential_prusa.cpp +++ b/src/libseqarrange/src/sequential_prusa.cpp @@ -11,7 +11,7 @@ #include "libslic3r/Polygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include "seq_version.hpp" diff --git a/src/libseqarrange/test/seq_test_interface.cpp b/src/libseqarrange/test/seq_test_interface.cpp index e76cdf119e..e41187e33c 100644 --- a/src/libseqarrange/test/seq_test_interface.cpp +++ b/src/libseqarrange/test/seq_test_interface.cpp @@ -16,7 +16,7 @@ #include "libslic3r/Polygon.hpp" #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include diff --git a/src/libseqarrange/test/seq_test_polygon.cpp b/src/libseqarrange/test/seq_test_polygon.cpp index b439464776..e8852d2696 100644 --- a/src/libseqarrange/test/seq_test_polygon.cpp +++ b/src/libseqarrange/test/seq_test_polygon.cpp @@ -15,7 +15,7 @@ #include #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include diff --git a/src/libseqarrange/test/seq_test_preprocess.cpp b/src/libseqarrange/test/seq_test_preprocess.cpp index a296b5801e..899e8079fe 100644 --- a/src/libseqarrange/test/seq_test_preprocess.cpp +++ b/src/libseqarrange/test/seq_test_preprocess.cpp @@ -17,7 +17,7 @@ #include #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include diff --git a/src/libseqarrange/test/seq_test_sequential.cpp b/src/libseqarrange/test/seq_test_sequential.cpp index 60382e34b1..595f22ac47 100644 --- a/src/libseqarrange/test/seq_test_sequential.cpp +++ b/src/libseqarrange/test/seq_test_sequential.cpp @@ -16,7 +16,7 @@ #include #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/ConvexHull.hpp" +#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/SVG.hpp" #include diff --git a/src/slic3r/GUI/ArrangeHelper.cpp b/src/slic3r/GUI/ArrangeHelper.cpp index f90ae679cd..aeedcf65be 100644 --- a/src/slic3r/GUI/ArrangeHelper.cpp +++ b/src/slic3r/GUI/ArrangeHelper.cpp @@ -6,7 +6,6 @@ #include #include "libseqarrange/include/seq_interface.hpp" -#include "libseqarrange/include/seq_sequential.hpp" namespace Slic3r { diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index ac025ce46c..83c320ec22 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(${_TEST_NAME}_tests ) # mold linker for successful linking needs also to link TBB library and link it before libslic3r. -target_link_libraries(${_TEST_NAME}_tests test_common TBB::tbb TBB::tbbmalloc libslic3r_gui libslic3r) +target_link_libraries(${_TEST_NAME}_tests test_common TBB::tbb TBB::tbbmalloc libslic3r_gui libslic3r libseqarrange) if (MSVC) target_link_libraries(${_TEST_NAME}_tests Setupapi.lib)