projects / packages / openscad.git / blame
| Commit | Line | Data |
|---|---|---|
| a4cd6760 AM |
1 | diff --git a/openscad.pro b/openscad.pro |
| 2 | index a2eefe6..20b1864 100644 | |
| 3 | --- a/openscad.pro | |
| 4 | +++ b/openscad.pro | |
| 5 | @@ -440,8 +440,7 @@ SOURCES += src/version_check.cc \ | |
| 5147411e JP |
6 | HEADERS += src/ext/lodepng/lodepng.h |
| 7 | ||
| a4cd6760 | 8 | # ClipperLib |
| 35570a78 JR |
9 | -SOURCES += src/ext/polyclipping/clipper.cpp |
| 10 | -HEADERS += src/ext/polyclipping/clipper.hpp | |
| a4cd6760 AM |
11 | +LIBS += -lpolyclipping |
| 12 | ||
| 13 | # libtess2 | |
| 5147411e | 14 | INCLUDEPATH += src/ext/libtess2/Include |
| a4cd6760 AM |
15 | diff --git a/src/clipper-utils.h b/src/clipper-utils.h |
| 16 | index 0dc7cd0..c98cda0 100644 | |
| 17 | --- a/src/clipper-utils.h | |
| 18 | +++ b/src/clipper-utils.h | |
| 19 | @@ -1,6 +1,6 @@ | |
| 20 | #pragma once | |
| 21 | ||
| 35570a78 | 22 | -#include "ext/polyclipping/clipper.hpp" |
| a4cd6760 AM |
23 | +#include <polyclipping/clipper.hpp> |
| 24 | #include "Polygon2d.h" | |
| 25 | ||
| 26 | namespace ClipperUtils { | |
| 35570a78 JR |
27 | --- openscad-openscad-2019.01-RC4/src/libsvg/shape.h~ 2019-03-17 02:57:25.000000000 +0100 |
| 28 | +++ openscad-openscad-2019.01-RC4/src/libsvg/shape.h 2019-04-19 14:37:29.511178262 +0200 | |
| 29 | @@ -34,7 +34,7 @@ | |
| 30 | #include <Eigen/Geometry> | |
| a4cd6760 | 31 | |
| 35570a78 JR |
32 | #include "util.h" |
| 33 | -#include "ext/polyclipping/clipper.hpp" | |
| 34 | +#include <polyclipping/clipper.hpp> | |
| 35 | ||
| 36 | namespace libsvg { | |
| a4cd6760 | 37 | |
| 63a4dc28 JR |
38 | --- openscad-2021.01/CMakeLists.txt.orig 2021-01-31 21:17:41.000000000 +0100 |
| 39 | +++ openscad-2021.01/CMakeLists.txt 2022-06-07 21:45:07.303640010 +0200 | |
| 40 | @@ -403,6 +403,9 @@ | |
| 41 | endif() | |
| 42 | endif() | |
| 43 | ||
| 44 | +pkg_check_modules(polyclipping REQUIRED polyclipping) | |
| 45 | +list(APPEND COMMON_LIBRARIES ${polyclipping_LIBRARIES}) | |
| 46 | + | |
| 47 | include_directories("src/ext/libtess2/Include") | |
| 48 | ||
| 49 | # NOTE: To keep HEADLESS builds working, do NOT add Qt-dependent sources here, | |
| 50 | @@ -495,7 +497,6 @@ | |
| 51 | src/UserModule.cc | |
| 52 | src/Tree.cc | |
| 53 | src/ext/lodepng/lodepng.cpp | |
| 54 | - src/ext/polyclipping/clipper.cpp | |
| 55 | src/ext/libtess2/Source/bucketalloc.c | |
| 56 | src/ext/libtess2/Source/dict.c | |
| 57 | src/ext/libtess2/Source/geom.c |