xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Use separate dockerfiles for gcc and clang

This commit is contained in:
Stelios Tsampas 2018-03-22 18:14:45 +02:00
parent a1f75bbbc5
commit 5687e9684c
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -8,9 +8,7 @@ matrix:
before_install:
- docker pull ubuntu:17.10
script:
- export CC=gcc
- export CXX=g++
- docker build .
- docker build -f Dockerfile.gcc .
- os: linux
language: c
sudo: required
@ -19,9 +17,7 @@ matrix:
before_install:
- docker pull ubuntu:17.10
script:
- export CC=clang
- export CXX=clang++
- docker build .
- docker build -f Dockerfile.clang .
- os: osx
osx_image: xcode7.3
before_install:

14
Dockerfile
View File

@ -1,14 +0,0 @@
FROM ubuntu:17.10
RUN apt-get update -qq
RUN apt-get install -qq -y libtool intltool gcc clang automake autoconf cmake
RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
RUN mkdir -p /src/build/
WORKDIR /src/build/
RUN env
COPY . /src/
RUN cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
RUN make

12
Dockerfile.clang Normal file
View File

@ -0,0 +1,12 @@
FROM ubuntu:17.10
RUN apt-get update -qq
RUN apt-get install -qq -y libtool intltool clang automake autoconf cmake
RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
RUN mkdir -p /src/build/
WORKDIR /src/build/
COPY . /src/
RUN cmake .. -DCMAKE_C_COMPILER='clang' -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
RUN make

12
Dockerfile.gcc Normal file
View File

@ -0,0 +1,12 @@
FROM ubuntu:17.10
RUN apt-get update -qq
RUN apt-get install -qq -y libtool intltool gcc automake autoconf cmake
RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
RUN mkdir -p /src/build/
WORKDIR /src/build/
COPY . /src/
RUN cmake .. -DCMAKE_C_COMPILER='gcc' -DCMAKE_CXX_COMPILER='g++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
RUN make