diff options
| author | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2020-05-19 23:50:48 +0000 |
|---|---|---|
| committer | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2020-05-19 23:50:48 +0000 |
| commit | 8989c4fbc944a9658bd7817d33ec52a3976172f9 (patch) | |
| tree | 8c7000ccc9372fc21c9419b474840426dbbc0a93 /scripts | |
| parent | 4f8367bf2f5b3294d9a82ebf9fb08d6e3bf83b94 (diff) | |
CI: Update Dockerfile
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/windows/Dockerfile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile index f4f1a836..b9a12d66 100644 --- a/scripts/windows/Dockerfile +++ b/scripts/windows/Dockerfile @@ -10,5 +10,12 @@ 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 ../.. -# 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. +# Build QtApng statically +RUN git clone https://github.com/Skycoder42/QtApng +WORKDIR QtApng +# libpng contains a self-test entry point that takes precedence for some reason +# over the final build's entry point. +RUN sed -i "s/^main(/libpng_main(/g" src/3rdparty/libpng/src/pngtest.c +RUN /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake +RUN make && make install +WORKDIR ..
\ No newline at end of file |