Merge pull request #170 from openscad/mingw_installer2

Mingw installer2

1 files changed, 12 insertions, 27 deletions

diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index e820e20..76bb7d4 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -19,15 +19,8 @@ if [ ! -f $OPENSCADDIR/openscad.pro ]; then
 	echo "Must be run from the OpenSCAD source root directory"
 	exit 0
 fi
-BASEDIR=$HOME/openscad_deps
-MXEDIR=$BASEDIR/mxe
-PATH=$MXEDIR/usr/bin:$PATH
-mkdir -p $BASEDIR
-
-echo MXEDIR: $MXEDIR
-echo BASEDIR: $BASEDIR
 echo OPENSCADDIR: $OPENSCADDIR
-echo PATH modified with $MXEDIR/usr/bin
+
 if [ ! $NUMCPU ]; then
 	echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
 	NUMCPU=1
@@ -40,35 +33,27 @@ if [ ! $NUMJOBS ]; then
 		NUMJOBS=1
 	fi
 fi
-echo NUMCPU: $NUMCPU
-echo NUMJOBS: $NUMJOBS
 
-cd $BASEDIR
-if [ ! -e mxe ]; then
+. ./scripts/setenv-mingw-xbuild.sh
+
+if [ ! -e $BASEDIR ]; then
+	mkdir -p $BASEDIR
+fi
+
+if [ ! -e $MXEDIR ]; then
 	echo "Downloading MXE into " $MXEDIR
+	cd $MXEDIR/..
 	git clone git://github.com/mxe/mxe.git
 fi
 
 echo "entering" $MXEDIR
 cd $MXEDIR
 echo "make mpfr eigen opencsg cgal qt -j $NUMCPU JOBS=$NUMJOBS"
-make mpfr eigen opencsg cgal qt -j $NUMCPU JOBS=$NUMJOBS
-#make mpfr -j$NUMCPU JOBS=$NUMJOBS # for testing
+make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS
+#make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing
 
 echo "leaving" $MXEDIR
+
 echo "entering $OPENSCADDIR"
 cd $OPENSCADDIR
-if [ -e mingw-cross-env ]; then
-	rm ./mingw-cross-env
-fi
-echo "linking mingw-cross-env directory"
-ln -s $MXEDIR/usr/i686-pc-mingw32/ ./mingw-cross-env
 
-echo
-echo "now copy/paste the following to cross-build openscad"
-echo
-echo "export PATH=$MXEDIR/usr/bin:\$PATH"
-echo "i686-pc-mingw32-qmake CONFIG+=mingw-cross-env openscad.pro"
-#echo "make -j$NUMCPU" # causes parser_yacc.hpp errors
-echo "make"
-echo