diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.h | 4 | ||||
| -rw-r--r-- | src/openscad.cc | 12 | ||||
| -rw-r--r-- | src/polyset.cc | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h index 79d36b7..fda4bc5 100644 --- a/src/CGAL_Nef_polyhedron.h +++ b/src/CGAL_Nef_polyhedron.h @@ -1,8 +1,6 @@ #ifndef CGAL_NEF_POLYHEDRON_H_ #define CGAL_NEF_POLYHEDRON_H_ -#ifdef ENABLE_CGAL - #include "cgalfwd.h" #include "memory.h" @@ -29,6 +27,4 @@ public: shared_ptr<CGAL_Nef_polyhedron3> p3; }; -#endif /* ENABLE_CGAL */ - #endif diff --git a/src/openscad.cc b/src/openscad.cc index 678d87a..d708a8e 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -134,6 +134,8 @@ int main(int argc, char **argv) ("help,h", "help message") ("version,v", "print the version") ("o,o", po::value<string>(), "out-file") + ("s,s", po::value<string>(), "stl-file") + ("x,x", po::value<string>(), "dxf-file") ("d,d", po::value<string>(), "deps-file") ("m,m", po::value<string>(), "makefile") ("D,D", po::value<vector<string> >(), "var=val"); @@ -160,6 +162,16 @@ int main(int argc, char **argv) if (output_file) help(argv[0]); output_file = vm["o"].as<string>().c_str(); } + if (vm.count("s")) { + fprintf(stderr, "DEPRECATED: The -s option is deprecated. Use -o instead.\n"); + if (output_file) help(argv[0]); + output_file = vm["s"].as<string>().c_str(); + } + if (vm.count("x")) { + fprintf(stderr, "DEPRECATED: The -x option is deprecated. Use -o instead.\n"); + if (output_file) help(argv[0]); + output_file = vm["x"].as<string>().c_str(); + } if (vm.count("d")) { if (deps_output_file) help(argv[0]); diff --git a/src/polyset.cc b/src/polyset.cc index 1d31005..742e425 100644 --- a/src/polyset.cc +++ b/src/polyset.cc @@ -27,10 +27,6 @@ #include "polyset.h" // FIXME: Reenable/rewrite - don't be dependant on GUI // #include "Preferences.h" -#ifdef ENABLE_CGAL -#include <CGAL/assertions_behaviour.h> -#include <CGAL/exceptions.h> -#endif #include "linalg.h" #include <Eigen/LU> #include <QColor> |