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 \ | |
| 6 | src/LibraryInfoDialog.cc | |
| 7 | ||
| 8 | # ClipperLib | |
| 9 | -SOURCES += src/polyclipping/clipper.cpp | |
| 10 | -HEADERS += src/polyclipping/clipper.hpp | |
| 11 | +LIBS += -lpolyclipping | |
| 12 | ||
| 13 | # libtess2 | |
| 14 | INCLUDEPATH += src/libtess2/Include | |
| 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 | ||
| 22 | -#include "polyclipping/clipper.hpp" | |
| 23 | +#include <polyclipping/clipper.hpp> | |
| 24 | #include "Polygon2d.h" | |
| 25 | ||
| 26 | namespace ClipperUtils { | |
| 27 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | |
| 28 | index 93658a0..a852ef6 100644 | |
| 29 | --- a/tests/CMakeLists.txt | |
| 30 | +++ b/tests/CMakeLists.txt | |
| 31 | @@ -705,7 +705,6 @@ set(COMMON_SOURCES | |
| 32 | ../src/GeometryCache.cc | |
| 33 | ../src/clipper-utils.cc | |
| 34 | ../src/Tree.cc | |
| 35 | - ../src/polyclipping/clipper.cpp | |
| 36 | ../src/libtess2/Source/bucketalloc.c | |
| 37 | ../src/libtess2/Source/dict.c | |
| 38 | ../src/libtess2/Source/geom.c | |
| 39 | @@ -786,14 +785,14 @@ target_link_libraries(csgtexttest tests-nocgal ${GLEW_LIBRARY} ${OPENCSG_LIBRARY | |
| 40 | # | |
| 41 | add_executable(cgalcachetest cgalcachetest.cc) | |
| 42 | set_target_properties(cgalcachetest PROPERTIES COMPILE_FLAGS "-DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") | |
| 43 | -target_link_libraries(cgalcachetest tests-cgal ${GLEW_LIBRARY} ${OPENCSG_LIBRARY} ${APP_SERVICES_LIBRARY}) | |
| 44 | +target_link_libraries(cgalcachetest tests-cgal -lpolyclipping ${GLEW_LIBRARY} ${OPENCSG_LIBRARY} ${APP_SERVICES_LIBRARY}) | |
| 45 | ||
| 46 | # | |
| 47 | # openscad no-qt | |
| 48 | # | |
| 49 | add_executable(openscad_nogui ../src/openscad.cc) | |
| 50 | set_target_properties(openscad_nogui PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -DEIGEN_DONT_ALIGN ${ENABLE_OPENCSG_FLAG} -DENABLE_CGAL ${CGAL_CXX_FLAGS_INIT}") | |
| 51 | -target_link_libraries(openscad_nogui tests-offscreen tests-cgal ${GLEW_LIBRARY} ${OPENCSG_LIBRARY} ${APP_SERVICES_LIBRARY}) | |
| 52 | +target_link_libraries(openscad_nogui tests-offscreen tests-cgal -lX11 -lpolyclipping ${GLEW_LIBRARY} ${OPENCSG_LIBRARY} ${APP_SERVICES_LIBRARY}) | |
| 53 | ||
| 54 | # also run translation compilation to verify the files are without syntax errors | |
| 55 | add_custom_target(locale_files ALL COMMAND ${CMAKE_SOURCE_DIR}/../scripts/translation-make.sh) |