From 15c7ee5db0d61bd12f66cea942b89cc1ef6bad6f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 14 Nov 2018 17:03:08 +0800 Subject: 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 --- scripts/windows-container/in-container-build.sh | 4 ++++ scripts/windows/travisbuild.sh | 3 +++ 2 files changed, 7 insertions(+) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2