diff options
author | ShadowNinja <shadowninja@minetest.net> | 2015-02-27 18:05:29 -0500 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2015-03-27 15:00:48 -0400 |
commit | 93fcab952b28f4db39d9326b83f14cbd86c0cf17 (patch) | |
tree | 4a2f0fcf7341c596f50ec24ff0a5a81d43d17ccd /.travis.yml | |
parent | 284fefb0c32e8222fadd78eeec6e7e718fe25668 (diff) | |
download | minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.tar.gz minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.tar.bz2 minetest-93fcab952b28f4db39d9326b83f14cbd86c0cf17.zip |
Clean up and tweak build system
* Combine client and server man pages.
* Update unit test options and available databases in man page.
* Add `--worldname` to man page.
* Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
* Disable server build by default on all operating systems.
* Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
* Enable LevelDB, Redis, and FreeType detection by default.
* Remove the `VERSION_PATCH_ORIG` hack.
* Add option to search for and use system JSONCPP.
* Remove broken LuaJIT version detection.
* Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
* Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
* Clean up style of CMake files.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4bce211f7..d17af5463 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ compiler: - gcc - clang env: - - WINDOWS=32 - - WINDOWS=64 - - WINDOWS=no + - PLATFORM=Win32 + - PLATFORM=Win64 + - PLATFORM=Linux before_install: ./util/travis/before_install.sh script: ./util/travis/script.sh notifications: @@ -13,7 +13,7 @@ notifications: matrix: fast_finish: true exclude: - - env: WINDOWS=32 + - env: PLATFORM=Win32 compiler: clang - - env: WINDOWS=64 + - env: PLATFORM=Win64 compiler: clang |