teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix travis build on master

Browse source 
- add luajit
- remove terra/callff
- fix template issue
- add missing include
- search for sol in extern
This commit is contained in:
Kyle Cooley 2018-05-20 14:26:25 -05:00
parent 8a393d2984
commit 3a68f4bd8f
6 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

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

12
CI/before_install.linux.sh
View file

@ -19,15 +19,3 @@ git clone https://github.com/TES3MP/RakNet
cd RakNet cd RakNet
cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release
make -j3 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

3
CI/before_script.linux.sh
View file

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

2
apps/openmw-mp/CMakeLists.txt
View file

@ -136,7 +136,7 @@ target_compile_definitions(tes3mp-server PRIVATE $<$<CONFIG:Debug>:SERVER_DEBUG>
set_property(TARGET tes3mp-server PROPERTY CXX_STANDARD 14) set_property(TARGET tes3mp-server PROPERTY CXX_STANDARD 14)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=2048) target_compile_options(tes3mp-server PRIVATE -Wno-ignored-qualifiers -ftemplate-depth=4096)
endif() endif()
target_link_libraries(tes3mp-server target_link_libraries(tes3mp-server

1
apps/openmw-mp/stacktrace.cpp
View file

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

3
cmake/FindSol2.cmake
View file

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