Travis CI updates

.travis.yml

@@ -1,23 +1,19 @@
 language: cpp
 compiler: gcc
 env:
-  - PLATFORM=linux
   global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
     - secure: "T5etXz6ru3TSrrKuzyJ15w6uV4EquyJfPMVhSipMCbRgEZhjh5pAW4UrCluFXbJrg3dRqvnrNVJe1Oq3puPWy99p9Zwvi+WBJwWarxW3SOfeUAATHazFBbYxnu9OJc4I2H7WtmQbV2b/DhxQaBVkzabS5uOL3dyG8CxSxHcQ86o="
 install:
   - chmod 0755 tools/travis/install.sh
   - tools/travis/install.sh
 script:
-  - chmod 0755 tools/travis/script.sh
-  - tools/travis/script.sh
+  - make -j2
 addons:
   coverity_scan:
     project:
       name: "TheJosh/chaotic-rage"
       description: "Build submitted via Travis CI"
     notification_email: josh.sickmate@gmail.com
     build_command_prepend: "chmod 0755 tools/travis/install.sh; tools/travis/install.sh"
-    build_command: "chmod 0755 tools/travis/script.sh; tools/travis/script.sh"
+    build_command: "make -j2"
     branch_pattern: coverity_scan

tools/travis/install.sh

@@ -1,21 +1,13 @@
 #!/bin/bash
 
-
-if [ "$PLATFORM" == "linux" ]; then
-	sudo apt-get update -qq || exit 1
-	sudo apt-get install -qq libgl1-mesa-dev libglu1-mesa-dev libglew-dev libfreetype6-dev zlib-bin freeglut3-dev >/dev/null || exit 1
-
-	cd tools/linux;
-	./assimp.sh >/dev/null || exit 1;
-	./bullet.sh >/dev/null || exit 1;
-	./sdl2.sh >/dev/null || exit 1;
-	./sdl2_image.sh >/dev/null || exit 1;
-	./sdl2_mixer.sh >/dev/null || exit 1;
-	./sdl2_net.sh >/dev/null || exit 1;
-	cd ../..;
-
-
-else
-	echo 'Unknown $PLATFORM variable'
-	exit 1
-fi
+sudo apt-get update -qq || exit 1
+sudo apt-get install -qq libgl1-mesa-dev libglu1-mesa-dev libglew-dev libfreetype6-dev zlib-bin freeglut3-dev >/dev/null || exit 1
+
+cd tools/linux;
+./assimp.sh >/dev/null || exit 1;
+./bullet.sh >/dev/null || exit 1;
+./sdl2.sh >/dev/null || exit 1;
+./sdl2_image.sh >/dev/null || exit 1;
+./sdl2_mixer.sh >/dev/null || exit 1;
+./sdl2_net.sh >/dev/null || exit 1;
+cd ../..;