diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
| commit | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (patch) | |
| tree | 3b3816d1557746f5f2e3e86a9239821472012024 /src/openscad.cc | |
| parent | d0de384a7e1642d09726579fdd75f1588cfaada7 (diff) | |
| parent | af0658a8fe441ebb0eb3d238e7055fd592343605 (diff) | |
Merge branch 'master' and fix bugs
Conflicts:
src/openscad.cc
tests/CMakeLists.txt
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 0770558..7ebad33 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -258,7 +258,6 @@ int main(int argc, char **argv) if (!filename) help(argv[0]); -#ifdef ENABLE_CGAL Context root_ctx; register_builtin(root_ctx); @@ -309,6 +308,7 @@ int main(int argc, char **argv) } } else { +#ifdef ENABLE_CGAL CGAL_Nef_polyhedron root_N = cgalevaluator.evaluateCGALMesh(*tree.root()); fs::current_path(original_path); @@ -402,8 +402,8 @@ int main(int argc, char **argv) } delete root_node; #else - fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); - exit(1); + fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); + exit(1); #endif } else if (useGUI) |