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 /build | |
| 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 'build')
| -rw-r--r-- | build/android/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 43ce24712..05997c5a2 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -732,14 +732,11 @@ $(ROOT)/jni/src/android_version.h : echo "#define VERSION_PATCH $$(cat ${ROOT}/../../CMakeLists.txt | \ grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ >> ${ROOT}/jni/src/android_version.h; \ - echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt | \ - grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \ - >> ${ROOT}/jni/src/android_version.h; \ export GITHASH=$$(git rev-parse --short=8 HEAD); \ export GITTAG=$$(git describe --abbrev=0 --tags); \ - echo "#define CMAKE_VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \ + echo "#define VERSION_GITHASH \"$$GITTAG-$$GITHASH-Android\"" \ >> ${ROOT}/jni/src/android_version.h; \ - echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ + echo "#define VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\ \".\"STR(VERSION_PATCH)" \ >> ${ROOT}/jni/src/android_version.h; |