diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-05-16 11:54:34 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-05-16 11:54:34 (GMT) |
| commit | 293f3cc7c9c6dfec76120714b33a458f54792545 (patch) | |
| tree | 27c7fe37bd7967b6588916009fad93667a0e1da6 /scripts/mingw-x-build-dependencies.sh | |
| parent | 26df5c446647aec19fa8a8615e61702950691746 (diff) | |
enable mingw64 cross build (alpha stage)
Diffstat (limited to 'scripts/mingw-x-build-dependencies.sh')
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 7a16530..03adc22 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -1,11 +1,13 @@ #!/bin/sh -e # # This script builds all library dependencies of OpenSCAD for cross-compilation -# from linux to mingw32 for windows, using the MXE cross build system. +# from linux to mingw32/64 for windows, using the MXE cross build system. # # This script must be run from the OpenSCAD source root directory # -# Usage: ./scripts/mingw-x-build-dependencies.sh +# Usage: +# ./scripts/mingw-x-build-dependencies.sh # 32 bit +# ./scripts/mingw-x-build-dependencies.sh 64 # 64 bit # # Prerequisites: # @@ -13,6 +15,8 @@ # # Also see http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X # +# Also note the 64 bit is built on the branch of mxe by Tony Theodore +# which hasnt been merged to official mxe as of writing OPENSCADDIR=$PWD if [ ! -f $OPENSCADDIR/openscad.pro ]; then @@ -34,7 +38,7 @@ if [ ! $NUMJOBS ]; then fi fi -. ./scripts/setenv-mingw-xbuild.sh +. ./scripts/setenv-mingw-xbuild.sh $* if [ ! -e $BASEDIR ]; then mkdir -p $BASEDIR @@ -44,7 +48,11 @@ if [ ! -e $MXEDIR ]; then mkdir -p $MXEDIR cd $MXEDIR/.. echo "Downloading MXE into " $PWD - git clone git://github.com/mxe/mxe.git + 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 + fi fi echo "entering" $MXEDIR |