mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 19:36:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

MXE: respect an MXE build type already defined

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2018-11-14 17:03:08 +08:00
parent 5963a15bbd
commit 15c7ee5db0
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/windows/mxe-based-build.sh
View file

@ -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

4
scripts/windows-container/in-container-build.sh
View file

@ -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

3
scripts/windows/travisbuild.sh
View file

@ -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