mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
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.
This commit is contained in:
parent
284fefb0c3
commit
93fcab952b
50 changed files with 749 additions and 1068 deletions
|
@ -20,27 +20,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include "version.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#if defined(__ANDROID__)
|
||||
#include "android_version.h"
|
||||
#elif defined(USE_CMAKE_CONFIG_H)
|
||||
#include "cmake_config_githash.h"
|
||||
#endif
|
||||
|
||||
#ifdef CMAKE_VERSION_GITHASH
|
||||
#define VERSION_GITHASH CMAKE_VERSION_GITHASH
|
||||
#else
|
||||
#ifndef VERSION_GITHASH
|
||||
#define VERSION_GITHASH VERSION_STRING
|
||||
#endif
|
||||
|
||||
const char *minetest_version_simple = VERSION_STRING;
|
||||
const char *minetest_version_hash = VERSION_GITHASH;
|
||||
|
||||
#ifdef USE_CMAKE_CONFIG_H
|
||||
const char *minetest_build_info =
|
||||
"VER=" VERSION_GITHASH " " CMAKE_BUILD_INFO;
|
||||
#elif defined(ANDROID)
|
||||
const char *minetest_build_info = "android jni";
|
||||
#else
|
||||
const char *minetest_build_info = "non-cmake";
|
||||
#endif
|
||||
const char *g_version_string = VERSION_STRING;
|
||||
const char *g_version_hash = VERSION_GITHASH;
|
||||
const char *g_build_info = "VER=" VERSION_GITHASH " " BUILD_INFO;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue