From d64f09007a9620b5ef6f48d23f8b51b0ccd0a6a8 Mon Sep 17 00:00:00 2001
From: Kyle Cooley <kyleacooley@gmail.com>
Date: Wed, 9 May 2018 16:09:48 -0400
Subject: [PATCH] Set compiler at start, bit of cleanup, luajit

---
 .travis.yml                |  5 +++--
 CI/before_install.linux.sh |  5 +++++
 CI/before_script.linux.sh  | 34 ++++++++++++++++++++++++----------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4710552f..14dc7b685 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,9 @@ addons:
       # Audio & Video
       libsdl2-dev, qtbase5-dev, libopenal-dev,
       # The other ones from OpenMW ppa
-      libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev
+      libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev,
+      # tes3mp stuff
+      libluajit-5.1-dev
     ]
 
   coverity_scan:
@@ -61,7 +63,6 @@ before_install:
 before_script: ./CI/before_script.${TRAVIS_OS_NAME}.sh
 script:
  - cd ./build
- - if [ ! -z "${MATRIX_CC}" ]; then eval "${MATRIX_CC}"; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j3; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index 29c9cc44e..704afe94b 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
 
+# Set up compilers
+if [ ! -z "${MATRIX_CC}" ]; then
+    eval "${MATRIX_CC}"
+fi
+
 # build libgtest & libgtest_main
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index efdf28c6c..da13c75f6 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -3,15 +3,29 @@
 free -m
 mkdir build
 cd build
-export CODE_COVERAGE=1
+
+export CODE_COVERAGE=0
 export RAKNET_ROOT=~/RakNet
-export Terra_ROOT=~/terra-Linux-x86_64-332a506
-export BUILD_SERVER=OFF
-if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; 
-else 
-    export COMPILER_NAME=gcc
-    export CXX=g++-6
-    export CC=gcc-6
-    export BUILD_SERVER=ON
+if [ ! -z "${ANALYZE}" ]; then
+    CODE_COVERAGE=1
 fi
-${ANALYZE}cmake .. -DBUILD_OPENMW_MP=${BUILD_SERVER} -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_BSATOOL=OFF -DBUILD_ESMTOOL=OFF -DBUILD_ESSIMPORTER=OFF -DBUILD_LAUNCHER=OFF -DBUILD_MWINIIMPORTER=OFF -DBUILD_MYGUI_PLUGIN=OFF -DBUILD_OPENCS=OFF -DBUILD_WIZARD=OFF -DBUILD_BROWSER=OFF -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a
+
+${ANALYZE}cmake .. \
+    -DBUILD_OPENMW_MP=ON \
+    -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} \
+    -DBUILD_BSATOOL=OFF \
+    -DBUILD_ESMTOOL=OFF \
+    -DBUILD_ESSIMPORTER=OFF \
+    -DBUILD_LAUNCHER=OFF \
+    -DBUILD_MWINIIMPORTER=OFF \
+    -DBUILD_MYGUI_PLUGIN=OFF \
+    -DBUILD_OPENCS=OFF \
+    -DBUILD_WIZARD=OFF \
+    -DBUILD_BROWSER=OFF \
+    -DBUILD_UNITTESTS=1 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBINDIR=/usr/games \
+    -DCMAKE_BUILD_TYPE="None" \
+    -DUSE_SYSTEM_TINYXML=TRUE \
+    -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a \
+    -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a