diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2019-07-27 12:33:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-27 12:33:52 -0500 |
| commit | ede4c512ae2b365c78af1a7452b49c45178f1b68 (patch) | |
| tree | 8b0eb74a90ef88bd9ea05077ebe06f8f4cecb712 | |
| parent | e3187b682469ad414de72b708bb8240e83303f5f (diff) | |
CI: Fix entry point bug in build artifact
| -rw-r--r-- | scripts/windows/Dockerfile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile index 90d6c27e..f4f1a836 100644 --- a/scripts/windows/Dockerfile +++ b/scripts/windows/Dockerfile @@ -1,4 +1,4 @@ -FROM oldmud0/mxe-qt:5.12.1-win32-static-posix +FROM oldmud0/mxe-qt:5.13.0-win32-static-posix #FROM fffaraz/qt:windows ENV TARGET_SPEC i686-w64-mingw32.static.posix @@ -10,8 +10,5 @@ RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake .. -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake --build . --config Release --target install WORKDIR ../.. -# Build QtApng statically -RUN git clone https://github.com/Skycoder42/QtApng -WORKDIR QtApng -RUN /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake && make qmake_all && make && make install -WORKDIR .. +# NOTE: Do not build QtApng statically! libpng contains a self-test entry point that +# takes precedence for some reason over the final build's entry point. |