summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Salvador Cuñat <salvador.cunat@gmail.com>2019-01-29 17:43:16 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-05-18 14:43:16 -0700
commit967f9fb5902c13363cf7d45153168b670c7cbf63 (patch)
tree44c506994c4ff246989777f3dec9a3fdb4a7489e /scripts
parent68592ebc6282fd025723fd423e6bf9cf353c66b2 (diff)
downloadsubsurface-967f9fb5902c13363cf7d45153168b670c7cbf63.tar.gz
Build static glib under mxe
mdbtools only builds static under mxe. This should add static build of glib to the container with the mxe libraries. [Dirk Hohndel: merged with latest version of Dockerfile] Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/docker/mxe-build-container/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/docker/mxe-build-container/Dockerfile b/scripts/docker/mxe-build-container/Dockerfile
index 346565300..a85bfbd6c 100644
--- a/scripts/docker/mxe-build-container/Dockerfile
+++ b/scripts/docker/mxe-build-container/Dockerfile
@@ -45,6 +45,8 @@ RUN mv /win/settings.mk /win/mxe
RUN cd /win/mxe ; \
make -j 6 2>&1 | tee build.log ;
RUN cd /win/mxe ; \
+ make MXE_TARGETS=i686-w64-mingw32.static glib -j 6 2>&1 |tee build.log ;
+RUN cd /win/mxe ; \
mkdir -p neolit ; cd neolit ; git clone -b wip/win git://github.com/qt/qtconnectivity
RUN cd /win/mxe/neolit/qtconnectivity ; \
PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /win/mxe/usr/i686-w64-mingw32.shared/qt5/bin/qmake qtconnectivity.pro ; \