yuzu-emu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2024-11-25 23:55:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the libstdc++11 libcxx for conan and include libzip in the base image

Browse Source
This commit is contained in:
James Rowe 2020-05-06 00:28:32 -06:00
parent 4fe0ebbd8f
commit 58cb2114b5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux-fresh/Dockerfile
View File

@ -5,18 +5,19 @@ RUN useradd -m -s /bin/bash yuzu && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
build-essential \ build-essential \
libboost-all-dev \ libboost-all-dev \
liblz4-dev \
libsdl2-dev \ libsdl2-dev \
libssl-dev \ libssl-dev \
libopus-dev \ libopus-dev \
libzip-dev \
libzstd-dev \ libzstd-dev \
zlib1g-dev \
python \ python \
python3-pip \ python3-pip \
qtbase5-dev \ qtbase5-dev \
qtbase5-private-dev \ qtbase5-private-dev \
qtwebengine5-dev \ qtwebengine5-dev \
libqt5opengl5-dev \ libqt5opengl5-dev \
liblz4-dev \
zlib1g-dev \
wget \ wget \
git \ git \
ccache \ ccache \
@ -25,6 +26,6 @@ RUN useradd -m -s /bin/bash yuzu && \
pip3 install conan && \ pip3 install conan && \
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
USER yuzu USER yuzu
RUN conan install catch2/2.11.0@ && \ RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install fmt/6.2.0@ && \ conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install nlohmann_json/3.7.3@ conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing