Redefine building matrix

Author: winterheart

.travis.yml

@@ -1,50 +1,35 @@
-language: python
-python: "3.7"
+language: c
+
+notifications:
+  email: false
 
 compiler:
   - clang
   - gcc
 
-notifications:
-  email: false
+os:
+  - linux
+  - osx
 
+dist: bionic
 addons:
   apt:
     packages:
       - cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev
 
 install:
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];   then pip3 install --upgrade pip ; pip3 install conan ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --upgrade pip  ; pip install conan  ; fi
   - conan user
   - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
 
-matrix:
-  include:
-    - os: linux
-      dist: bionic
-      before_install:
-        - pip install --upgrade pip
-        - pip install conan
-      sudo: required
-      env:
-        - SDL2_LIB=BUNDLED
-        - SDL2_MIXER_LIB=BUNDLED
-        - FLUIDSYNTH_LIB=BUNDLED
-        - BITS=64
-    - os: osx
-      language: shell
-      before_install:
-        - pip3 install --upgrade pip
-        - pip3 install conan
-      env:
-        - SDL2_LIB=BUNDLED
-        - SDL2_MIXER_LIB=BUNDLED
-        - FLUIDSYNTH_LIB=BUNDLED
-        - BITS=64
+env:
+  - SDL2_LIB=BUNDLED SDL2_MIXER_LIB=BUNDLED FLUIDSYNTH_LIB=BUNDLED BITS=64
 
 script:
   - mkdir build && cd build
   - conan install .. --build=missing
-  - cmake .. -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB}
+  - cmake .. -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB}
   - make -j2 systemshock
 
 before_deploy: