diff options
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 2 | ||||
| -rw-r--r-- | scripts/windows-container/in-container-build.sh | 4 | ||||
| -rw-r--r-- | scripts/windows/travisbuild.sh | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 455f5d6ae..58334a5a1 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -101,7 +101,7 @@ EXECDIR=`pwd` BASEDIR=$(cd "$EXECDIR/.."; pwd) BUILDDIR=$(cd "$EXECDIR"; pwd) MXEDIR=${MXEDIR:-mxe} -MXEBUILDTYPE="i686-w64-mingw32.shared.posix.dw2" +MXEBUILDTYPE=${MXEBUILDTYPE:-i686-w64-mingw32.shared.posix.dw2} echo $BUILDDIR diff --git a/scripts/windows-container/in-container-build.sh b/scripts/windows-container/in-container-build.sh index bd04bb425..6f1bf0cb2 100644 --- a/scripts/windows-container/in-container-build.sh +++ b/scripts/windows-container/in-container-build.sh @@ -12,6 +12,10 @@ set -e mkdir -p win32 cd win32 + +# right now the container still has an older version of MXE installed +export MXEBUILDTYPE=i686-w64-mingw32.shared + bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i diff --git a/scripts/windows/travisbuild.sh b/scripts/windows/travisbuild.sh index 02ab1db86..42f7d788d 100644 --- a/scripts/windows/travisbuild.sh +++ b/scripts/windows/travisbuild.sh @@ -13,6 +13,9 @@ mkdir win32 ls -l cd win32 +# make sure we use the pre-installed version of MXE +export MXEBUILDTYPE=i686-w64-mingw32.shared + # the MXE build used in this VM doesn't support FTDI bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/mxe-based-build.sh -noftdi installer bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/smtk2ssrf-mxe-build.sh -i |