summaryrefslogtreecommitdiff
path: root/scripts/mingw-x-build-dependencies.sh
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-08-04 22:18:36 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-08-04 22:18:36 (GMT)
commita56721af475311b2442e9d5d937455be6f135c93 (patch)
treec2860d474e749b3ce107f5d2c8e80c5d219e6cc6 /scripts/mingw-x-build-dependencies.sh
parenta32dcbf4ba7e9439433cf7727066a466058629ba (diff)
use mxe's nsis if we dont have it. detect MCAD better.
Diffstat (limited to 'scripts/mingw-x-build-dependencies.sh')
-rwxr-xr-xscripts/mingw-x-build-dependencies.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 1ea7d14..76bb7d4 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -40,17 +40,16 @@ if [ ! -e $BASEDIR ]; then
mkdir -p $BASEDIR
fi
-cd $BASEDIR
-
-if [ ! -e mxe ]; then
+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 eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS
#make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing
echo "leaving" $MXEDIR
contact: Jan Huwald // Impressum