diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CGALRenderer.cc | 6 | ||||
| -rw-r--r-- | src/CSGTermEvaluator.cc | 1 | ||||
| -rw-r--r-- | src/dxfdata.h | 6 | ||||
| -rw-r--r-- | src/linearextrude.cc | 1 | ||||
| -rw-r--r-- | src/mainwin.cc | 3 | ||||
| -rw-r--r-- | src/openscad.cc | 1 | ||||
| -rw-r--r-- | src/openscad.h | 6 |
7 files changed, 14 insertions, 10 deletions
diff --git a/src/CGALRenderer.cc b/src/CGALRenderer.cc index 4d165ce..95bcba1 100644 --- a/src/CGALRenderer.cc +++ b/src/CGALRenderer.cc @@ -24,10 +24,12 @@ * */ -#include "CGALRenderer.h" +// dxfdata.h must come first for Eigen SIMD alignment issues +#include "dxfdata.h" #include "polyset.h" + +#include "CGALRenderer.h" #include "CGAL_renderer.h" -#include "dxfdata.h" #include "dxftess.h" #include "CGAL_Nef_polyhedron.h" #include "cgal.h" diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc index d1af987..0c7bca7 100644 --- a/src/CSGTermEvaluator.cc +++ b/src/CSGTermEvaluator.cc @@ -17,6 +17,7 @@ #include <sstream> #include <iostream> #include <assert.h> +#include <cstddef> /*! \class CSGTermEvaluator diff --git a/src/dxfdata.h b/src/dxfdata.h index d24541c..d138e7a 100644 --- a/src/dxfdata.h +++ b/src/dxfdata.h @@ -1,8 +1,8 @@ #ifndef DXFDATA_H_ #define DXFDATA_H_ -#include <vector> #include <Eigen/Dense> +#include <vector> using Eigen::Vector2d; @@ -30,7 +30,11 @@ public: } }; +#ifdef __APPLE__ std::vector<Vector2d, Eigen::aligned_allocator<Vector2d> > points; +#else + std::vector<Vector2d> points; +#endif std::vector<Path> paths; std::vector<Dim> dims; diff --git a/src/linearextrude.cc b/src/linearextrude.cc index 5c3b684..9c3557b 100644 --- a/src/linearextrude.cc +++ b/src/linearextrude.cc @@ -32,6 +32,7 @@ #include "builtin.h" #include "PolySetEvaluator.h" #include "openscad.h" // get_fragments_from_r() +#include "mathc99.h" #include <sstream> #include <boost/assign/std/vector.hpp> diff --git a/src/mainwin.cc b/src/mainwin.cc index be82d26..43a973d 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -92,6 +92,8 @@ using namespace boost::lambda; #endif // ENABLE_CGAL +using std::cerr; + // Global application state unsigned int GuiLocker::gui_locked = 0; @@ -872,7 +874,6 @@ void MainWindow::compileCSG(bool procevents) this->thrownTogetherRenderer = new ThrownTogetherRenderer(this->root_chain, this->highlights_chain, this->background_chain); - PRINT("CSG generation finished."); int s = t.elapsed() / 1000; PRINTF("Total rendering time: %d hours, %d minutes, %d seconds", s / (60*60), (s / 60) % 60, s % 60); diff --git a/src/openscad.cc b/src/openscad.cc index f3d28a6..4ff250d 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -427,3 +427,4 @@ int main(int argc, char **argv) return rc; } + diff --git a/src/openscad.h b/src/openscad.h index e6b9b9f..61aec0e 100644 --- a/src/openscad.h +++ b/src/openscad.h @@ -27,12 +27,6 @@ #ifndef OPENSCAD_H #define OPENSCAD_H -// for win32 and maybe others.. -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif - - extern class AbstractModule *parse(const char *text, const char *path, int debug); extern int get_fragments_from_r(double r, double fn, double fs, double fa); |