diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-14 17:03:08 +0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-11-14 17:06:10 +0800 |
| commit | 15c7ee5db0d61bd12f66cea942b89cc1ef6bad6f (patch) | |
| tree | c90d1ce18e2370a4ab0affc3b021725fa8fe1cdf | |
| parent | 5963a15bbd8479a1a3eafcb5fc8bf9a98ccc2769 (diff) | |
| download | subsurface-15c7ee5db0d61bd12f66cea942b89cc1ef6bad6f.tar.gz | |
MXE: respect an MXE build type already defined
And use that to have our Travis build still work with the existing MXE
build container as well as the even older, pre-compiled MXE binaries
used in the windows build.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -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 |