diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 17:02:32 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 17:02:32 -0500 |
| commit | 156a760ebab6839c53f9c613881f0937e814414a (patch) | |
| tree | fd9fafecd25fbd66f0e4f8101f856c8cf68b790e /scripts/windows/Dockerfile | |
| parent | d89a4370a753f6e1da22349866b1b00f638884a6 (diff) | |
Full revert to tag 2.6.2
Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).
Changes dropped include:
- Witness needed
- Shake
- Frame SFX
- Multiple custom objections
- Multithreaded thumbnail generation
- Looping
- Various translation additions
- "Mirror IC"
- Color in IC log
- An invocation of clang-format
Next time, work together and split your big fork into independently
testable feature branches.
Diffstat (limited to 'scripts/windows/Dockerfile')
| -rw-r--r-- | scripts/windows/Dockerfile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile index b9a12d66..f4f1a836 100644 --- a/scripts/windows/Dockerfile +++ b/scripts/windows/Dockerfile @@ -10,12 +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 -# 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 +# 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. |