3 files changed, 77 insertions, 28 deletions

diff --git a/boost.pri b/boost.pri
index c2f5d8e..02e4247 100644
--- a/boost.pri
+++ b/boost.pri
@@ -6,35 +6,64 @@ boost {
   !isEmpty(BOOST_DIR) {
     QMAKE_INCDIR += $$BOOST_DIR
     message("boost location: $$BOOST_DIR")
-    win32:QMAKE_LIBDIR += -L$$BOOST_DIR/lib
+    win32: QMAKE_LIBDIR += -L$$BOOST_DIR/lib
   }
 
-  win32:!CONFIG(mingw-cross-env) {
-    LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
-  } 
-
   CONFIG(mingw-cross-env) {
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
     DEFINES += Boost_USE_STATIC_LIBS
-    LIBS += -lboost_thread_win32-mt -lboost_program_options-mt
+    BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt
   } 
 
-  unix {
-    BMT_TEST1 = /usr/lib64/libboost*thread-mt*
-    BMT_TEST2 = /usr/lib/libboost*thread-mt*
-    BMT_TEST3 = $$BOOST_DIR/lib/libboost*thread-mt*
+  isEmpty(BOOST_LINK_FLAGS):win32 {
+    BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
+  } 
 
-    exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) {
-      LIBS += -lboost_thread-mt -lboost_program_options-mt
-      BOOST_IS_MT = true
-    } 
+  # check for OPENSCAD_LIBDIR + multithread
+  isEmpty(BOOST_LINK_FLAGS) {
+    OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
+    !isEmpty(OPENSCAD_LIBDIR) {
+      exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) {
+        BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
+      } else {
+        exists($$OPENSCAD_LIBDIR/lib/libboost*thread*) {
+          BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
+        }
+      }
+    }
   }
 
-  unix|macx {
-    isEmpty(BOOST_IS_MT) { 
-      LIBS += -lboost_thread -lboost_program_options
+  # check for BOOSTDIR + multithread
+  isEmpty(BOOST_LINK_FLAGS) {
+    BOOST_DIR = $$(BOOSTDIR)
+    !isEmpty(BOOST_DIR) {
+      exists($$BOOST_DIR/lib/libboost*thread-mt*) {
+        BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
+      } else {
+        exists($$BOOST_DIR/lib/libboost*thread*) {
+          BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
+        }
+      }
     }
   }
 
+  isEmpty(BOOST_LINK_FLAGS) {
+    unix {
+      BMT_TEST1 = /usr/lib64/libboost*thread-mt*
+      BMT_TEST2 = /usr/lib/libboost*thread-mt*
+      exists($$BMT_TEST1)|exists($$BMT_TEST2) {
+        BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt
+      }
+    }
+  }
+
+  isEmpty(BOOST_LINK_FLAGS) {
+    unix|macx {
+      BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
+    }
+  }
+
+  LIBS += $$BOOST_LINK_FLAGS
+
 }
diff --git a/eigen2.pri b/eigen2.pri
index 44649f8..6062c76 100644
--- a/eigen2.pri
+++ b/eigen2.pri
@@ -1,20 +1,36 @@
 eigen2 {
+
+  CONFIG(mingw-cross-env) {
+    EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2
+  }
+
   # Optionally specify location of Eigen2 using the 
-  # EIGEN2DIR env. variable
-  EIGEN2_DIR = $$(EIGEN2DIR)
-  !isEmpty(EIGEN2_DIR) {
-    EIGEN2_INCLUDEPATH = $$EIGEN2_DIR
+  # OPENSCAD_LIBRARIES env. variable
+  isEmpty(EIGEN2_INCLUDEPATH) {
+    OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
+    !isEmpty(OPENSCAD_LIBRARIES_DIR) {
+      exists($$OPENSCAD_LIBRARIES_DIR/include/eigen2) {
+        EIGEN2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen2
+      }
+    }
   }
-  else {
-    CONFIG(mingw-cross-env) {
-      EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2
-    } else {
-      freebsd-g++: EIGEN2_INCLUDEPATH *= /usr/local/include/eigen2
-      macx: EIGEN2_INCLUDEPATH *= /opt/local/include/eigen2
-      !macx:!freebsd-g++:!win32:EIGEN2_INCLUDEPATH *= /usr/include/eigen2
+
+  # Optionally specify location of Eigen2 using the 
+  # EIGEN2DIR env. variable
+  isEmpty(EIGEN2_INCLUDEPATH) {
+    EIGEN2_DIR = $$(EIGEN2DIR)
+    !isEmpty(EIGEN2_DIR) { 
+      EIGEN2_INCLUDEPATH = $$EIGEN2_DIR
+      message("EIGEN2 location: $$EIGEN2_INCLUDEPATH")
     }
   }
 
+  isEmpty(EIGEN2_INCLUDEPATH) {
+    freebsd-g++: EIGEN2_INCLUDEPATH = /usr/local/include/eigen2
+    macx: EIGEN2_INCLUDEPATH = /opt/local/include/eigen2
+    linux*: EIGEN2_INCLUDEPATH = /usr/include/eigen2
+  }
+
   # eigen2 being under 'include/eigen2' needs special prepending
   QMAKE_INCDIR_QT = $$EIGEN2_INCLUDEPATH $$QMAKE_INCDIR_QT
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a8ab9b9..ed5bdc0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -131,6 +131,10 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   endif()
 endif()
 
+if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "")
+  set(EIGEN2_INCLUDE_DIR "$ENV{OPENSCAD_LIBRARIES}/include/eigen2")
+endif()
+
 if (NOT EIGEN2_INCLUDE_DIR)
   find_path(EIGEN2_INCLUDE_DIR
             Eigen/Core