Merge pull request #431 from Aesylwinn/Travis-master

Fix travis build on master

.travis.yml

@@ -35,7 +35,7 @@ addons:
       # The other ones from OpenMW ppa
       libbullet-dev, libswresample-dev, libopenscenegraph-3.4-dev, libmygui-dev,
       # tes3mp stuff
-      libboost1.61-dev, libqt5opengl5-dev
+      libboost1.61-dev, libqt5opengl5-dev, libluajit-5.1-dev
     ]
 
   coverity_scan:
@@ -60,8 +60,6 @@ matrix:
       env:
         - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"
   allow_failures:
-    - env:
-        - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"
     - env:
         - ANALYZE="scan-build-3.8 --use-cc clang-3.8 --use-c++ clang++-3.8 "
         - MATRIX_CC="CC=clang-3.8 && CXX=clang++-3.8"

CI/before_install.linux.sh

@@ -19,15 +19,3 @@ git clone https://github.com/TES3MP/RakNet
 cd RakNet
 cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release
 make -j3
-
-cd ~/
-git clone https://github.com/Koncord/CallFF
-cd CallFF
-mkdir build
-cd build
-cmake ../
-make -j3
-
-cd ~/
-wget https://github.com/zdevito/terra/releases/download/release-2016-03-25/terra-Linux-x86_64-332a506.zip
-unzip terra-Linux-x86_64-332a506.zip

CI/before_script.linux.sh

@@ -10,7 +10,6 @@ if [ ! -z "${MATRIX_CC}" ]; then
 fi
 
 export RAKNET_ROOT=~/RakNet
-export Terra_ROOT=~/terra-Linux-x86_64-332a506
 
 export CODE_COVERAGE=0
 if [ ! -z "${ANALYZE}" ]; then
@@ -38,5 +37,3 @@ ${ANALYZE}cmake .. \
     -DUSE_SYSTEM_TINYXML=TRUE \
     -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a \
     -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a \
-    -DCallFF_INCLUDES=~/CallFF/include \
-    -DCallFF_LIBRARY=~/CallFF/build/src/libcallff.a

apps/openmw-mp/stacktrace.cpp

@@ -7,6 +7,7 @@
 
 #ifndef _WIN32
 
+#include <cxxabi.h>
 #include <execinfo.h>
 
 void stacktrace()

apps/openmw-mp/stackwalker/StackWalker.h

@@ -94,7 +94,7 @@ public:
 // in older compilers in order to use it... starting with VC7 we can declare it as "protected"
 protected:
 #endif
-	enum { STACKWALK_MAX_NAMELEN = 1024 }; // max name length for found symbols
+    enum { STACKWALK_MAX_NAMELEN = 1024 }; // max name length for found symbols
 
 protected:
   // Entry for each Callstack-Entry

cmake/FindSol2.cmake

@@ -6,6 +6,5 @@ include(LibFindMacros)
 
 libfind_pkg_detect(Sol2 sol2
     FIND_PATH sol.hpp
-)
+    PATHS ${CMAKE_SOURCE_DIR}/extern/sol/single/sol)
 libfind_process(Sol2)
-