diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-21 14:22:51 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-21 14:22:51 -0500 |
| commit | d89a4370a753f6e1da22349866b1b00f638884a6 (patch) | |
| tree | 5e50c8ed5bfcfe6c127d68fc04e50286fd0bf16d /scripts | |
| parent | 5010f57a33aef2d2c2180c95239d81012896d8ac (diff) | |
Update CI pipeline for release
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/wasabi_program.sh | 2 | ||||
| -rw-r--r-- | scripts/windows/Dockerfile | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/scripts/wasabi_program.sh b/scripts/wasabi_program.sh index 41e2e352..37feac6e 100755 --- a/scripts/wasabi_program.sh +++ b/scripts/wasabi_program.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Updates the specified program manifest to a new archive and version # and uploads the new archive and manifest to S3/Wasabi. # 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 |