Skip to content

Commit 5808b14

Browse files
committed
Updates to travis
Switch to conan package manager, it will handle all dependencies.
1 parent 1e0db49 commit 5808b14

File tree

1 file changed

+16
-25
lines changed

1 file changed

+16
-25
lines changed

.travis.yml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ language: c
33
notifications:
44
email: false
55

6+
addons:
7+
apt:
8+
packages:
9+
- cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev
10+
11+
install:
12+
- pip install --upgrade pip
13+
- pip install conan
14+
- conan user
15+
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
16+
617
matrix:
718
include:
819
- os: linux
@@ -13,46 +24,26 @@ matrix:
1324
- SDL2_MIXER_LIB=BUNDLED
1425
- FLUIDSYNTH_LIB=BUNDLED
1526
- BITS=64
16-
addons:
17-
apt:
18-
packages:
19-
- cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev # libfluidsynth-dev libsdl2-dev libsdl2-mixer-dev
20-
compiler: gcc
21-
- os: linux
22-
dist: trusty
23-
sudo: required
24-
env:
25-
- SDL2_LIB=BUNDLED
26-
- SDL2_MIXER_LIB=BUNDLED
27-
- FLUIDSYNTH_LIB=BUNDLED
28-
- CMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu
29-
- BITS=32
30-
before_script:
31-
- cp ./CMakeLists.32bit.txt ./CMakeLists.txt
32-
addons:
33-
apt:
34-
packages:
35-
- cmake-data cmake libx32gcc-4.8-dev libc6-dev-i386 gcc-multilib g++-multilib libglu1-mesa-dev:i386 libgl1-mesa-dev:i386
3627
compiler: gcc
3728
- os: osx
3829
compiler: clang
3930
env:
4031
- SDL2_LIB=BUNDLED
4132
- SDL2_MIXER_LIB=BUNDLED
42-
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
33+
- FLUIDSYNTH_LIB=BUNDLED
4334
- BITS=64
4435
- os: osx
4536
compiler: gcc
4637
env:
4738
- SDL2_LIB=BUNDLED
4839
- SDL2_MIXER_LIB=BUNDLED
49-
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
40+
- FLUIDSYNTH_LIB=BUNDLED
5041
- BITS=64
5142

5243
script:
53-
- chmod a+rx ./osx-linux/*.sh
54-
- sudo TRAVIS=$TRAVIS ./osx-linux/install_${BITS}bit_sdl.sh
55-
- cmake -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB} .
44+
- mkdir build && cd build
45+
- conan install .. --build=missing
46+
- cmake .. -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB}
5647
- make -j2 systemshock
5748

5849
before_deploy:

0 commit comments

Comments
 (0)