Skip to content

Commit 9053388

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

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

.travis.yml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1-
language: c
1+
language: python
2+
python: "3.7"
23

34
notifications:
45
email: false
56

7+
addons:
8+
apt:
9+
packages:
10+
- cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev
11+
12+
install:
13+
- pip install --upgrade pip
14+
- pip install conan
15+
- conan user
16+
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
17+
618
matrix:
719
include:
820
- os: linux
@@ -13,46 +25,26 @@ matrix:
1325
- SDL2_MIXER_LIB=BUNDLED
1426
- FLUIDSYNTH_LIB=BUNDLED
1527
- 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
3628
compiler: gcc
3729
- os: osx
3830
compiler: clang
3931
env:
4032
- SDL2_LIB=BUNDLED
4133
- SDL2_MIXER_LIB=BUNDLED
42-
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
34+
- FLUIDSYNTH_LIB=BUNDLED
4335
- BITS=64
4436
- os: osx
4537
compiler: gcc
4638
env:
4739
- SDL2_LIB=BUNDLED
4840
- SDL2_MIXER_LIB=BUNDLED
49-
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
41+
- FLUIDSYNTH_LIB=BUNDLED
5042
- BITS=64
5143

5244
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} .
45+
- mkdir build && cd build
46+
- conan install .. --build=missing
47+
- cmake .. -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB}
5648
- make -j2 systemshock
5749

5850
before_deploy:

0 commit comments

Comments
 (0)