mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add ninja to dockerfiles

This commit is contained in:
Michał Janiszewski 2017-09-17 22:16:27 +02:00
parent 6ab0f2f905
commit 7671b9fcde
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfiles/32bit/Dockerfile
View File

@ -3,7 +3,7 @@ FROM nfnty/arch-mini
RUN echo -e "[archlinuxfr]\nSigLevel = Never\nServer = http://repo.archlinux.fr/\$arch" >> /etc/pacman.conf
RUN sed -i '/#\[multilib\]/,/#Include = \/etc\/pacman.d\/mirrorlist/ s/#//' /etc/pacman.conf
RUN pacman -Syyu --noconfirm
RUN pacman -S --noconfirm git curl jshon expac yajl wget unzip cmake && pacman -Sc
RUN pacman -S --noconfirm git curl jshon expac yajl wget unzip cmake ninja && pacman -Sc
RUN yes | pacman -S gcc-multilib gcc-libs-multilib && pacman -Sc
RUN pacman -S --noconfirm --needed make pkg-config patch yaourt grep file sudo gawk fakeroot gzip m4 which util-linux && pacman -Sc

2
dockerfiles/64bit/Dockerfile
View File

@ -1,6 +1,6 @@
FROM nfnty/arch-mini
RUN pacman -Syyu --noconfirm
RUN pacman -S --noconfirm gcc gcc-libs git curl jshon expac yajl wget unzip cmake && pacman -Sc
RUN pacman -S --noconfirm gcc gcc-libs git curl jshon expac yajl wget unzip cmake ninja && pacman -Sc
RUN pacman -S --noconfirm curl sdl2 speex fontconfig openssl libpng jansson libzip && pacman -Sc
RUN pacman -S --noconfirm --needed make pkg-config

2
dockerfiles/full/Dockerfile
View File

@ -1,7 +1,7 @@
FROM nfnty/arch-mini
RUN pacman -Syyu --noconfirm
RUN pacman -S --noconfirm git curl jshon expac
RUN pacman -S --noconfirm git curl jshon expac ninja
RUN pacman -S --noconfirm --needed base-devel
RUN pacman -S --noconfirm yajl

1
dockerfiles/mingw-arch/Dockerfile
View File

@ -30,6 +30,7 @@ RUN pacman -S --noconfirm --noprogressbar \
fakeroot \
file \
patch \
ninja \
&& (echo -e "y\ny\n" | pacman -Scc)
# Add mingw-repo

2
dockerfiles/mingw/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04
RUN apt-get update
RUN apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake pkg-config
RUN apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake pkg-config ninja-build
RUN echo "#!/bin/sh\nexport PKG_CONFIG_PATH=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig:/usr/local/cross-tools/orctlibs/lib/pkgconfig\npkg-config \$@" > /usr/local/bin/i686-w64-mingw32-pkg-config && chmod a+x /usr/local/bin/i686-w64-mingw32-pkg-config

2
dockerfiles/ubuntu_amd64/Dockerfile
View File

@ -15,4 +15,4 @@ RUN apt-get update \
&& ln -s /usr/bin/clang++-4.0 /usr/bin/clang++
RUN apt-get -y upgrade
# clang and gcc already installed
RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev
RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev ninja-build

2
dockerfiles/ubuntu_i686/Dockerfile
View File

@ -2,4 +2,4 @@ FROM ubuntu:16.04
RUN dpkg --add-architecture i386
RUN apt-get update
RUN apt-get -y upgrade
RUN apt-get install --no-install-recommends -y gcc-multilib g++-multilib cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386
RUN apt-get install --no-install-recommends -y gcc-multilib g++-multilib cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 pkg-config:i386 libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libzip-dev:i386 libssl-dev:i386 ninja-build