28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
diff -up openscad-2021.01/src/cgalutils-tess.cc.cgal-build-fix openscad-2021.01/src/cgalutils-tess.cc
|
|
--- openscad-2021.01/src/cgalutils-tess.cc.cgal-build-fix 2022-02-11 18:47:52.034828460 +0000
|
|
+++ openscad-2021.01/src/cgalutils-tess.cc 2022-02-11 18:49:37.655228014 +0000
|
|
@@ -6,10 +6,12 @@
|
|
#pragma push_macro("NDEBUG")
|
|
#undef NDEBUG
|
|
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
|
|
-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
|
|
- #include <CGAL/Triangulation_2_projection_traits_3.h>
|
|
+#if CGAL_VERSION_NR < 1050401000
|
|
+#include <CGAL/Triangulation_2_projection_traits_3.h>
|
|
+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
|
#else
|
|
- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
|
|
+#include <CGAL/Projection_traits_3.h>
|
|
+typedef CGAL::Filtered_projection_traits_3<K> Projection;
|
|
#endif
|
|
#include <CGAL/Triangulation_face_base_with_info_2.h>
|
|
#pragma pop_macro("NDEBUG")
|
|
@@ -19,7 +21,6 @@ struct FaceInfo {
|
|
bool in_domain() { return nesting_level%2 == 1; }
|
|
};
|
|
|
|
-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
|
typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
|
|
typedef CGAL::Triangulation_data_structure_2<
|
|
CGAL::Triangulation_vertex_base_2<Projection>,
|