mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-04-01 02:06:42 +00:00
[CI] Fix oversights in .travis.yml and before_script_linux.sh
This commit is contained in:
parent
cbba81df03
commit
1b9842c175
2 changed files with 1 additions and 2 deletions
|
@ -27,7 +27,7 @@ addons:
|
|||
# Audio, Video and Misc. deps
|
||||
libsdl2-dev, libqt4-dev, libopenal-dev, libunshield-dev, libtinyxml-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
|
||||
libboost-dev, libqt5opengl5-dev, libluajit-5.1-dev
|
||||
]
|
||||
|
|
|
@ -7,7 +7,6 @@ GOOGLETEST_DIR="$(pwd)/googletest/build"
|
|||
|
||||
mkdir build
|
||||
cd build
|
||||
<<<<<<< HEAD
|
||||
|
||||
# Set up compilers
|
||||
if [ ! -z "${MATRIX_CC}" ]; then
|
||||
|
|
Loading…
Reference in a new issue