diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-05-18 15:49:26 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-05-18 15:49:26 (GMT) |
| commit | 48816160cd87fe067156c5b8622e31ab10754e74 (patch) | |
| tree | 7541083a081589c6044299d1ff6cded0eba19f09 /scripts | |
| parent | b3b83059e7c62339712e71294662cd3fa883f0db (diff) | |
fix eigen bugs mingw32/64
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/builder.sh | 1 | ||||
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 14 | ||||
| -rw-r--r-- | scripts/setenv-mingw-xbuild.sh | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/scripts/builder.sh b/scripts/builder.sh index 7cd551e..11b6e02 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -33,6 +33,7 @@ get_source_code() git clone http://github.com/openscad/openscad.git cd openscad git submodule update --init # MCAD + git checkout issue341 } build_win32() diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index c3d5179..e9f124b 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -46,13 +46,13 @@ fi if [ ! -e $MXEDIR ]; then mkdir -p $MXEDIR -fi -cd $MXEDIR/.. -echo "Downloading MXE into " $PWD -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 + 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 fi echo "entering" $MXEDIR diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh index 15449ce..d3a014c 100644 --- a/scripts/setenv-mingw-xbuild.sh +++ b/scripts/setenv-mingw-xbuild.sh @@ -57,11 +57,10 @@ fi PATH=$MXEDIR/usr/bin:$PATH PATH=$MXETARGETDIR/qt/bin:$PATH - - - +OPENSCAD_LIBRARIES=$MXETARGETDIR if [ "`echo $* | grep clean`" ]; then + OPENSCAD_LIBRARIES= BASEDIR= MXEDIR= MXETARGETDIR= @@ -75,6 +74,7 @@ else ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env fi +export OPENSCAD_LIBRARIES export BASEDIR export MXEDIR export MXETARGETDIR @@ -82,6 +82,7 @@ export DEPLOYDIR export PATH export MINGWX_SAVED_ORIGINAL_PATH +echo OPENSCAD_LIBRARIES: $OPENSCAD_LIBRARIES echo BASEDIR: $BASEDIR echo MXEDIR: $MXEDIR echo MXETARGETDIR: $MXETARGETDIR |