mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-15 18:57:08 +00:00
Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7 * Move Clang to Clang 3.6 & Clang 4.0 * LINT moves from Clang 3.9 to Clang 4.0 * Move XCode 7.3 to 8.0 * Use more travis tricks to install compilers instead of adding complexity to our build script * Clang format fixes on checked files (compat Cpp11 instead of Cpp03) * Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial) * Drop mingw cmake generated files and add them to gitignore
This commit is contained in:
parent
0e58168fe5
commit
bf6569b570
16 changed files with 149 additions and 77 deletions
|
@ -1,5 +1,40 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
set_linux_compiler_env() {
|
||||
if [[ "${COMPILER}" == "gcc-5.1" ]]; then
|
||||
export CC=gcc-5.1
|
||||
export CXX=g++-5.1
|
||||
elif [[ "${COMPILER}" == "gcc-6" ]]; then
|
||||
export CC=gcc-6
|
||||
export CXX=g++-6
|
||||
elif [[ "${COMPILER}" == "gcc-7" ]]; then
|
||||
export CC=gcc-7
|
||||
export CXX=g++-7
|
||||
elif [[ "${COMPILER}" == "clang-3.6" ]]; then
|
||||
export CC=clang-3.6
|
||||
export CXX=clang++-3.6
|
||||
elif [[ "${COMPILER}" == "clang-4.0" ]]; then
|
||||
export CC=clang-4.0
|
||||
export CXX=clang++-4.0
|
||||
fi
|
||||
}
|
||||
|
||||
# Linux build only
|
||||
install_linux_deps() {
|
||||
sudo apt-get update
|
||||
sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
|
||||
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
|
||||
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
|
||||
gettext libpq-dev libleveldb-dev
|
||||
}
|
||||
|
||||
# Mac OSX build only
|
||||
install_macosx_deps() {
|
||||
brew update
|
||||
brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
|
||||
#brew upgrade postgresql
|
||||
}
|
||||
|
||||
# Relative to git-repository root:
|
||||
TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue