* Use separate dockerfiles for gcc and clang
This commit is contained in:
parent
a1f75bbbc5
commit
5687e9684c
|
@ -8,9 +8,7 @@ matrix:
|
||||||
before_install:
|
before_install:
|
||||||
- docker pull ubuntu:17.10
|
- docker pull ubuntu:17.10
|
||||||
script:
|
script:
|
||||||
- export CC=gcc
|
- docker build -f Dockerfile.gcc .
|
||||||
- export CXX=g++
|
|
||||||
- docker build .
|
|
||||||
- os: linux
|
- os: linux
|
||||||
language: c
|
language: c
|
||||||
sudo: required
|
sudo: required
|
||||||
|
@ -19,9 +17,7 @@ matrix:
|
||||||
before_install:
|
before_install:
|
||||||
- docker pull ubuntu:17.10
|
- docker pull ubuntu:17.10
|
||||||
script:
|
script:
|
||||||
- export CC=clang
|
- docker build -f Dockerfile.clang .
|
||||||
- export CXX=clang++
|
|
||||||
- docker build .
|
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
before_install:
|
before_install:
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -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
|
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue