fix eigen bugs mingw32/64

4 files changed, 12 insertions, 24 deletions

diff --git a/eigen.pri b/eigen.pri
index 1c9a5ef..7b4d46a 100644
--- a/eigen.pri
+++ b/eigen.pri
@@ -15,10 +15,6 @@ OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
 EIGEN2_DIR = $$(EIGEN2DIR)
 EIGEN_DIR = $$(EIGENDIR)
 
-CONFIG(mingw-cross-env) {
-  EIGEN_INCLUDEPATH = mingw-cross-env/include/eigen2
-}
-
 # Optionally specify location of Eigen3 using the 
 # OPENSCAD_LIBRARIES env. variable
 !isEmpty(OPENSCAD_LIBRARIES_DIR) {
@@ -69,16 +65,6 @@ isEmpty(EIGEN_INCLUDEPATH) {
   EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
 }
 
-mingw-cross-env {
-  exists(mingw-cross-env/../i686-pc-mingw32-pkg-config) {
-    EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
-  }
-  exists(mingw-cross-env/../x86_64-w64-mingw32-pkg-config) {
-    EIGEN_CFLAGS = $$system("x86_64-w64-mingw32-pkg-config --cflags eigen3")
-  }
-  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
-}
-
 # disable Eigen SIMD optimizations for platforms where it breaks compilation
 !macx {
   !freebsd-g++ {
diff --git a/scripts/builder.sh b/scripts/builder.sh
index 7cd551e..11b6e02 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -33,6 +33,7 @@ get_source_code()
 	git clone http://github.com/openscad/openscad.git
 	cd openscad
 	git submodule update --init # MCAD
+	git checkout issue341
 }
 
 build_win32()
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index c3d5179..e9f124b 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -46,13 +46,13 @@ fi
 
 if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
-fi
-cd $MXEDIR/..
-echo "Downloading MXE into " $PWD
-if [ "`echo $* | grep 64`" ]; then
-	git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
-else
-	git clone git://github.com/mxe/mxe.git
+	cd $MXEDIR/..
+	echo "Downloading MXE into " $PWD
+	if [ "`echo $* | grep 64`" ]; then
+		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
+	else
+		git clone git://github.com/mxe/mxe.git $MXEDIR
+	fi
 fi
 
 echo "entering" $MXEDIR
diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh
index 15449ce..d3a014c 100644
--- a/scripts/setenv-mingw-xbuild.sh
+++ b/scripts/setenv-mingw-xbuild.sh
@@ -57,11 +57,10 @@ fi
 PATH=$MXEDIR/usr/bin:$PATH
 PATH=$MXETARGETDIR/qt/bin:$PATH
 
-
-
-
+OPENSCAD_LIBRARIES=$MXETARGETDIR
 
 if [ "`echo $* | grep clean`" ]; then
+  OPENSCAD_LIBRARIES=
   BASEDIR=
   MXEDIR=
   MXETARGETDIR=
@@ -75,6 +74,7 @@ else
   ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
 fi
 
+export OPENSCAD_LIBRARIES
 export BASEDIR
 export MXEDIR
 export MXETARGETDIR
@@ -82,6 +82,7 @@ export DEPLOYDIR
 export PATH
 export MINGWX_SAVED_ORIGINAL_PATH
 
+echo OPENSCAD_LIBRARIES: $OPENSCAD_LIBRARIES
 echo BASEDIR: $BASEDIR
 echo MXEDIR: $MXEDIR
 echo MXETARGETDIR: $MXETARGETDIR