SwitchEmu/build-environments
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/build-environments.git synced 2026-03-13 03:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-mingw: upgrade conan packages, conan GCC version

Browse Source 
Also use ownstuff ffmpeg, instead of the dead link from mingw-setup.sh
mingw-setup.sh was thus removed as it only did one thing that could be
reduced to a single command in the Dockerfile.
This commit is contained in:
lat9nq
2020-09-26 16:55:32 -04:00
parent 7dba201b19
commit 34efbab012
4 changed files with 102 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
linux-mingw/Dockerfile
View File

@@ -22,6 +22,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
cmake \
ninja \
mingw-w64-boost \
mingw-w64-ffmpeg \
mingw-w64-gcc \
mingw-w64-lz4 \
mingw-w64-opus \
@@ -40,16 +41,16 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
rm -rf /usr/share/man/ /tmp/ /var/tmp/
# Setup extra mingw work arounds
COPY mingw-setup.sh /tmp/
RUN cd /tmp/ && bash -e mingw-setup.sh
RUN pip3 install pefile
# Compatibility with the old Ubuntu MingW image
RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5
# Install conan and add the mingw cross compile as the default profile
RUN pip3 install conan
COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/
COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml
USER 1027
# Install/build the missing libs (uses the default mingw cross compile profile)
RUN conan install catch2/2.11.0@ --build=missing && \
conan install fmt/6.2.0@ --build=missing && \
conan install nlohmann_json/3.7.3@ --build=missing
RUN conan install catch2/2.13.1@ --build=missing && \
conan install fmt/7.0.3@ --build=missing && \
conan install nlohmann_json/3.9.1@ --build=missing