slic3r/slic3r-clipper.patch

52 lines
1.3 KiB
Diff
Raw Normal View History

2014-01-03 14:50:05 +00:00
diff --git a/xs/Build.PL b/xs/Build.PL
2014-06-29 16:18:33 +00:00
index 5a10ac0..fb0f6a6 100644
2014-01-03 14:50:05 +00:00
--- a/xs/Build.PL
+++ b/xs/Build.PL
2014-06-29 16:18:33 +00:00
@@ -41,6 +41,7 @@ my $build = Module::Build::WithXSpp->new(
Module::Build::WithXSpp 0.13
)},
extra_compiler_flags => \@cflags,
2014-01-03 14:50:05 +00:00
+ extra_linker_flags => [qw(-lpolyclipping)],
2014-06-29 16:18:33 +00:00
2014-01-03 14:50:05 +00:00
# Provides extra C typemaps that are auto-merged
extra_typemap_modules => {
diff --git a/xs/src/ClipperUtils.hpp b/xs/src/ClipperUtils.hpp
2014-06-29 16:18:33 +00:00
index 2ab3ff7..2058f82 100644
2014-01-03 14:50:05 +00:00
--- a/xs/src/ClipperUtils.hpp
+++ b/xs/src/ClipperUtils.hpp
@@ -2,7 +2,7 @@
#define slic3r_ClipperUtils_hpp_
#include <myinit.h>
-#include "clipper.hpp"
+#include <polyclipping/clipper.hpp>
#include "ExPolygon.hpp"
#include "Polygon.hpp"
2014-06-29 16:18:33 +00:00
#include "Surface.hpp"
diff --git a/xs/src/Geometry.cpp b/xs/src/Geometry.cpp
index 0295d54..a8cae39 100644
--- a/xs/src/Geometry.cpp
+++ b/xs/src/Geometry.cpp
@@ -1,7 +1,7 @@
#include "Geometry.hpp"
#include "Line.hpp"
#include "PolylineCollection.hpp"
-#include "clipper.hpp"
+#include <polyclipping/clipper.hpp>
#include <algorithm>
#include <cmath>
#include <list>
2014-01-03 14:50:05 +00:00
diff --git a/xs/xsp/Clipper.xsp b/xs/xsp/Clipper.xsp
2014-06-29 16:18:33 +00:00
index 43a30a4..263c808 100644
2014-01-03 14:50:05 +00:00
--- a/xs/xsp/Clipper.xsp
+++ b/xs/xsp/Clipper.xsp
@@ -2,7 +2,7 @@
%{
#include <myinit.h>
-#include "clipper.hpp"
+#include <polyclipping/clipper.hpp>
#include "ClipperUtils.hpp"
%}