diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
| commit | 462d4d447885594629fefb8a658f9f1d079bcc44 (patch) | |
| tree | 6690951e4f814b87a1a372a913b75ceda1f6cc1a /scripts/mingw-x-build-dependencies.sh | |
| parent | 435e0c021c5018ee5de69d3218c3e31c8ab75be5 (diff) | |
| parent | 33c34b6f7c43d19bbfa3bf91e7b577bcc062e5bd (diff) | |
Merge branch 'master' into travis
Diffstat (limited to 'scripts/mingw-x-build-dependencies.sh')
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index e9f124b..c0f658d 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -6,8 +6,13 @@ # This script must be run from the OpenSCAD source root directory # # Usage: -# ./scripts/mingw-x-build-dependencies.sh # 32 bit -# ./scripts/mingw-x-build-dependencies.sh 64 # 64 bit +# ./scripts/mingw-x-build-dependencies.sh # 32 bit +# ./scripts/mingw-x-build-dependencies.sh 64 # 64 bit +# +# If you just want to download, and build later: +# +# ./scripts/mingw-x-build-dependencies.sh download # 32 bit download +# ./scripts/mingw-x-build-dependencies.sh 64 download # 64 bit download # # Prerequisites: # @@ -48,21 +53,25 @@ if [ ! -e $MXEDIR ]; then mkdir -p $MXEDIR 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 + git clone git://github.com/mxe/mxe.git $MXEDIR fi echo "entering" $MXEDIR cd $MXEDIR if [ "`echo $* | grep 64`" ]; then - MXE_TARGETS='x86_64-w64-mingw32' + MXE_TARGETS='x86_64-w64-mingw32' + if [ "`echo $* | grep download`" ]; then + PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt' + else PACKAGES='mpfr eigen opencsg cgal qt' + fi else - MXE_TARGETS= + MXE_TARGETS='i686-pc-mingw32' # fixme - does this work? test it. + if [ "`echo $* | grep download`" ]; then + PACKAGES='download-mpfr download-eigen download-opencsg download-cgal download-qt download-nsis' + else PACKAGES='mpfr eigen opencsg cgal qt nsis' + fi fi echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS |