From e29ba42d591a6bf24f38fecc4409af1e597732db Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 1 Nov 2011 11:47:37 -0700
Subject: bring inline with master


diff --git a/cgal.pri b/cgal.pri
index 96cd2ba..1d9ef22 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -1,6 +1,5 @@
 cgal {
   DEFINES += ENABLE_CGAL
-  CONFIG(mingw-cross-env):DEFINES += BOOST_STATIC BOOST_THREAD_USE_LIB Boost_USE_STATIC_LIBS
 
   isEmpty(DEPLOYDIR) {
     # Optionally specify location of CGAL using the 
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h
index 9d1fabe..3a8122b 100644
--- a/src/CSGTermEvaluator.h
+++ b/src/CSGTermEvaluator.h
@@ -7,10 +7,6 @@
 #include <cstddef>
 #include "visitor.h"
 
-#if defined __WIN32__ && ! defined _MSC_VER
-#include <cstddef>
-#endif
-
 class CSGTermEvaluator : public Visitor
 {
 public:
diff --git a/src/dxfdata.h b/src/dxfdata.h
index 17da1b9..7eea6a9 100644
--- a/src/dxfdata.h
+++ b/src/dxfdata.h
@@ -1,8 +1,5 @@
 #ifndef DXFDATA_H_
 #define DXFDATA_H_
-#ifndef EIGEN_DONT_ALIGN
-#define EIGEN_DONT_ALIGN
-#endif
 
 #include "linalg.h"
 #include <vector>
diff --git a/src/linalg.h b/src/linalg.h
index 744e810..e20d8d8 100644
--- a/src/linalg.h
+++ b/src/linalg.h
@@ -1,8 +1,6 @@
 #ifndef LINALG_H_
 #define LINALG_H_
-#ifndef EIGEN_DONT_ALIGN
-#define EIGEN_DONT_ALIGN
-#endif
+
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 #include <Eigen/Dense>
-- 
cgit v0.10.1