diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-05-17 03:59:58 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-05-17 03:59:58 (GMT) |
| commit | be87d30f427a4ffff8a21c3871e0304670443710 (patch) | |
| tree | 9163d650d0d5c7c320659ee636a418ae5a82d3aa /scripts/mingw-x-build-dependencies.sh | |
| parent | 293f3cc7c9c6dfec76120714b33a458f54792545 (diff) | |
enable both win32 and win64 build and upload (beta level) from same script
Diffstat (limited to 'scripts/mingw-x-build-dependencies.sh')
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 03adc22..168b847 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -48,7 +48,7 @@ if [ ! -e $MXEDIR ]; then mkdir -p $MXEDIR cd $MXEDIR/.. echo "Downloading MXE into " $PWD - if [ `echo $* | grep 64` ]; then + 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 @@ -57,9 +57,15 @@ fi echo "entering" $MXEDIR cd $MXEDIR -echo "make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS" -make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS -#make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing +if [ "`echo $* | grep 64`" ]; then + MXE_TARGETS='x86_64-w64-mingw32' + PACKAGES='mpfr eigen opencsg cgal qt' +else + MXE_TARGETS= + PACKAGES='mpfr eigen opencsg cgal qt nsis' +fi +echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS +make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS echo "leaving" $MXEDIR |