1 files changed, 22 insertions, 18 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index e820e20..405b7e8 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,10 +33,18 @@ if [ ! $NUMJOBS ]; then
 		NUMJOBS=1
 	fi
 fi
-echo NUMCPU: $NUMCPU
-echo NUMJOBS: $NUMJOBS
+
+. ./scripts/setenv-mingw-xbuild.sh
+
+if [ ! -e $BASEDIR ]; then
+	mkdir -p $BASEDIR
+fi
+if [ ! -e $DEPLOYDIR ]; then
+	mkdir -p $DEPLOYDIR
+fi
 
 cd $BASEDIR
+
 if [ ! -e mxe ]; then
 	echo "Downloading MXE into " $MXEDIR
 	git clone git://github.com/mxe/mxe.git
@@ -53,22 +54,25 @@ 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 -j $NUMCPU JOBS=$NUMJOBS # for testing
 
 echo "leaving" $MXEDIR
+
 echo "entering $OPENSCADDIR"
 cd $OPENSCADDIR
-if [ -e mingw-cross-env ]; then
-	rm ./mingw-cross-env
+
+if [ -e $DEPLOYDIR/mingw-cross-env ]; then
+	rm $DEPLOYDIR/mingw-cross-env
 fi
-echo "linking mingw-cross-env directory"
-ln -s $MXEDIR/usr/i686-pc-mingw32/ ./mingw-cross-env
+echo "linking mxe to" $DEPLOYDIR/mingw-cross-env
+ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env
 
 echo
-echo "now copy/paste the following to cross-build openscad"
+echo "now copy/paste the following to cross-build openscad in" $DEPLOYDIR
 echo
-echo "export PATH=$MXEDIR/usr/bin:\$PATH"
-echo "i686-pc-mingw32-qmake CONFIG+=mingw-cross-env openscad.pro"
+echo cd $DEPLOYDIR
+echo "i686-pc-mingw32-qmake CONFIG+=mingw-cross-env ../openscad.pro"
 #echo "make -j$NUMCPU" # causes parser_yacc.hpp errors
 echo "make"
+echo cd $OPENSCADDIR
 echo