mirror of
https://github.com/luanti-org/luanti.git
synced 2025-10-24 05:15:22 +02:00
Revert all commits up to (including) a704c04f
This commit is contained in:
@@ -8,15 +8,12 @@ if [ $CC = "clang" ]; then
|
||||
sudo apt-get install llvm-3.1
|
||||
sudo apt-get install clang
|
||||
fi
|
||||
sudo apt-get install p7zip-full
|
||||
if [ $WINDOWS = "no" ]; then
|
||||
sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
|
||||
libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libhiredis-dev \
|
||||
libogg-dev libvorbis-dev libopenal-dev gettext
|
||||
# Linking to LevelDB is broken, use a custom build
|
||||
wget http://sfan5.pf-control.de/libleveldb-1.18-ubuntu12.04.7z
|
||||
sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
|
||||
libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev \
|
||||
libvorbis-dev libopenal-dev gettext
|
||||
else
|
||||
sudo apt-get install p7zip-full
|
||||
if [ $WINDOWS = "32" ]; then
|
||||
wget http://sfan5.pf-control.de/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z
|
||||
sed -e "s|%PREFIX%|i686-w64-mingw32|" \
|
||||
|
||||
@@ -3,12 +3,8 @@
|
||||
if [ $WINDOWS = "no" ]; then
|
||||
mkdir -p travisbuild
|
||||
cd travisbuild
|
||||
cmake -DENABLE_GETTEXT=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DCMAKE_BUILD_TYPE=Debug ..
|
||||
cmake -DENABLE_GETTEXT=1 ..
|
||||
make -j2
|
||||
echo "Running unit tests for minetest"
|
||||
../bin/minetest --run-unittests
|
||||
echo "Running unit tests for minetestserver"
|
||||
../bin/minetestserver --run-unittests
|
||||
else
|
||||
[ $CC = "clang" ] && exit 1 # Not supposed to happen
|
||||
# We need to have our build directory outside of the minetest directory because
|
||||
|
||||
Reference in New Issue
Block a user