2015-06-29 12:38:50 +00:00
|
|
|
diff --git a/xs/src/libslic3r/ClipperUtils.hpp b/xs/src/libslic3r/ClipperUtils.hpp
|
2018-06-25 16:46:56 +00:00
|
|
|
index ddd551c..8149366 100644
|
2015-06-29 12:38:50 +00:00
|
|
|
--- a/xs/src/libslic3r/ClipperUtils.hpp
|
|
|
|
+++ b/xs/src/libslic3r/ClipperUtils.hpp
|
2014-01-03 14:50:05 +00:00
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
#define slic3r_ClipperUtils_hpp_
|
|
|
|
|
2018-06-25 16:46:56 +00:00
|
|
|
#include <libslic3r.h>
|
2014-01-03 14:50:05 +00:00
|
|
|
-#include "clipper.hpp"
|
|
|
|
+#include <polyclipping/clipper.hpp>
|
|
|
|
#include "ExPolygon.hpp"
|
|
|
|
#include "Polygon.hpp"
|
2014-06-29 16:18:33 +00:00
|
|
|
#include "Surface.hpp"
|
2015-06-29 12:38:50 +00:00
|
|
|
diff --git a/xs/src/libslic3r/Geometry.cpp b/xs/src/libslic3r/Geometry.cpp
|
2018-06-25 16:46:56 +00:00
|
|
|
index 7bcb644..5258485 100644
|
2015-06-29 12:38:50 +00:00
|
|
|
--- a/xs/src/libslic3r/Geometry.cpp
|
|
|
|
+++ b/xs/src/libslic3r/Geometry.cpp
|
|
|
|
@@ -3,7 +3,7 @@
|
|
|
|
#include "ExPolygon.hpp"
|
2014-06-29 16:18:33 +00:00
|
|
|
#include "Line.hpp"
|
|
|
|
#include "PolylineCollection.hpp"
|
|
|
|
-#include "clipper.hpp"
|
|
|
|
+#include <polyclipping/clipper.hpp>
|
|
|
|
#include <algorithm>
|
2018-06-25 16:46:56 +00:00
|
|
|
#include <cassert>
|
2014-06-29 16:18:33 +00:00
|
|
|
#include <cmath>
|
2018-06-25 16:46:56 +00:00
|
|
|
diff --git a/xs/src/libslic3r/SVG.hpp b/xs/src/libslic3r/SVG.hpp
|
|
|
|
index fbb5e37..bb9f4cc 100644
|
|
|
|
--- a/xs/src/libslic3r/SVG.hpp
|
|
|
|
+++ b/xs/src/libslic3r/SVG.hpp
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
#define slic3r_SVG_hpp_
|
|
|
|
|
|
|
|
#include "libslic3r.h"
|
|
|
|
-#include "clipper.hpp"
|
|
|
|
+#include <polyclipping/clipper.hpp>
|
|
|
|
#include "ExPolygon.hpp"
|
|
|
|
#include "Line.hpp"
|
|
|
|
#include "TriangleMesh.hpp"
|
2014-01-03 14:50:05 +00:00
|
|
|
diff --git a/xs/xsp/Clipper.xsp b/xs/xsp/Clipper.xsp
|
2018-06-25 16:46:56 +00:00
|
|
|
index 7bbbdb8..8b52133 100644
|
2014-01-03 14:50:05 +00:00
|
|
|
--- a/xs/xsp/Clipper.xsp
|
|
|
|
+++ b/xs/xsp/Clipper.xsp
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
|
|
%{
|
2018-06-25 16:46:56 +00:00
|
|
|
#include <xsinit.h>
|
2014-01-03 14:50:05 +00:00
|
|
|
-#include "clipper.hpp"
|
|
|
|
+#include <polyclipping/clipper.hpp>
|
2015-06-29 12:38:50 +00:00
|
|
|
#include "libslic3r/ClipperUtils.hpp"
|
2014-01-03 14:50:05 +00:00
|
|
|
%}
|
|
|
|
|