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 /src/guiEngine.cpp | |
| 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 'src/guiEngine.cpp')
| -rw-r--r-- | src/guiEngine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 30296b40c..c143e5110 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -171,8 +171,8 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - std::wstring t = narrow_to_wide(std::string("Minetest ") + - minetest_version_hash); + std::wstring t = narrow_to_wide(std::string(PROJECT_NAME " ") + + g_version_hash); core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight()); rect += v2s32(4, 0); @@ -571,8 +571,8 @@ bool GUIEngine::downloadFile(std::string url, std::string target) /******************************************************************************/ void GUIEngine::setTopleftText(std::string append) { - std::wstring toset = narrow_to_wide( std::string("Minetest ") + - minetest_version_hash); + std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME " ") + + g_version_hash); if (append != "") { |