mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 12:06:41 +00:00
Code Issues Releases Wiki Activity

[CI] Fix oversights in .travis.yml and before_script_linux.sh

Browse source
This commit is contained in:
David Cernat 2019-08-21 11:23:49 +03:00
parent cbba81df03
commit 1b9842c175
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -27,7 +27,7 @@ addons:
# Audio, Video and Misc. deps # Audio, Video and Misc. deps
libsdl2-dev, libqt4-dev, libopenal-dev, libunshield-dev, libtinyxml-dev, libsdl2-dev, libqt4-dev, libopenal-dev, libunshield-dev, libtinyxml-dev,
# 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
libboost-dev, libqt5opengl5-dev, libluajit-5.1-dev libboost-dev, libqt5opengl5-dev, libluajit-5.1-dev
] ]

1
CI/before_script.linux.sh
View file

@ -7,7 +7,6 @@ GOOGLETEST_DIR="$(pwd)/googletest/build"
mkdir build mkdir build
cd build cd build
<<<<<<< HEAD
# Set up compilers # Set up compilers
if [ ! -z "${MATRIX_CC}" ]; then if [ ! -z "${MATRIX_CC}" ]; then