diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-28 14:19:45 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-30 12:24:36 -0700 |
| commit | e71e715cd347d3dc1e503695d7a747f175123e9e (patch) | |
| tree | a32eb900ce59dd97efc4a2c9095ba7fc5c06489d /scripts/docker/mxe-build-container/Dockerfile-stage2 | |
| parent | a0cdd38ff65eb01b9528ef68cc740acc95be7d88 (diff) | |
| download | subsurface-e71e715cd347d3dc1e503695d7a747f175123e9e.tar.gz | |
build-system: Docker build for 64bit MXE
We previously tried to build the MXE Docker container on GitHub using
an Action, but that really didn't work well and was a lot more trouble
than it was worth.
So this goes back to an offline build mechanism where I simply create
an updated Docker image when needed and push that to Docker Hub.
But this nearly hides the most interesting change here - we are finally
switching to using 64bit binaries on Windows. It's 2020 and fewer than
1% of our users use 32bit Windows machines. We'll need to expand this
to be able to have both a 32bit and a 64bit version of Subsurface for
Windows. But for now, this solves the problem for 99% of our users.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/mxe-build-container/Dockerfile-stage2')
| -rw-r--r-- | scripts/docker/mxe-build-container/Dockerfile-stage2 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/scripts/docker/mxe-build-container/Dockerfile-stage2 b/scripts/docker/mxe-build-container/Dockerfile-stage2 deleted file mode 100644 index d8760f723..000000000 --- a/scripts/docker/mxe-build-container/Dockerfile-stage2 +++ /dev/null @@ -1,13 +0,0 @@ -ARG VERSION - -# Start from the container that we created in stage 1 -From subsurface/mxe-build-container:$VERSION - -# this time the settings include QtWebKit - since everything else was built -# during the first stage, QtWebKit will be the only thing that gets built -ADD settings-stage2.mk /win/mxe/settings.mk -RUN cd /win/mxe ; \ - make -j 2 2>&1 | tee build.log ; -RUN cd /win/mxe ; \ - make MXE_TARGETS=i686-w64-mingw32.static glib mdbtools -j 6 2>&1 | tee -a build.log ; - |