Skip to content

Commit

Permalink
* Use separate dockerfiles for gcc and clang
Browse files Browse the repository at this point in the history
  • Loading branch information
loathingKernel committed Mar 22, 2018
1 parent a1f75bb commit 5687e96
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 20 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
14 changes: 0 additions & 14 deletions Dockerfile

This file was deleted.

12 changes: 12 additions & 0 deletions Dockerfile.clang
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 0 deletions Dockerfile.gcc
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5687e96

Please sign in to comment.