diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-24 20:04:20 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-24 20:04:20 +0200 |
| commit | f69123050b62ada635751b7155bb6822b0a97a9b (patch) | |
| tree | 2ac77db755865c134ab58492e3024d6401ed1eb4 /src | |
| parent | ad6b0873532d769e108930734f17d2b5dfd0c49d (diff) | |
| parent | a5a9c9f799dfbad2e542e4bd7b2c9ae7821ecb6b (diff) | |
| download | minetest-f69123050b62ada635751b7155bb6822b0a97a9b.tar.gz minetest-f69123050b62ada635751b7155bb6822b0a97a9b.tar.bz2 minetest-f69123050b62ada635751b7155bb6822b0a97a9b.zip | |
Merge branch 'master' of github.com:erlehmann/minetest-delta
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake_config.h.in | 1 | ||||
| -rw-r--r-- | src/gettext.h | 2 | ||||
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/servermain.cpp | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in index 6a8f93bac..7cbb11f6b 100644 --- a/src/cmake_config.h.in +++ b/src/cmake_config.h.in @@ -6,6 +6,7 @@ #define PROJECT_NAME "@PROJECT_NAME@" #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" #define VERSION_STRING "@VERSION_STRING@" +#define USE_GETTEXT @USE_GETTEXT@ #ifdef NDEBUG #define BUILD_TYPE "Release" #else diff --git a/src/gettext.h b/src/gettext.h index 7c3a6ffab..493f9b21b 100644 --- a/src/gettext.h +++ b/src/gettext.h @@ -1,3 +1,5 @@ +#include "config.h" // for USE_GETTEXT + #if USE_GETTEXT #include <libintl.h> #else diff --git a/src/main.cpp b/src/main.cpp index bdfbc35f7..bcca60d95 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1132,7 +1132,7 @@ int main(int argc, char *argv[]) // Create user data directory
fs::CreateDir(porting::path_userdata);
- init_gettext((porting::path_userdata+"/locale").c_str());
+ init_gettext((porting::path_data+"/../locale").c_str());
// Initialize debug streams
#ifdef RUN_IN_PLACE
@@ -1153,7 +1153,7 @@ int main(int argc, char *argv[]) BEGIN_DEBUG_EXCEPTION_HANDLER
// Print startup message
- dstream<<DTIME<<"minetest-c55"
+ dstream<<DTIME<<PROJECT_NAME <<
" with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
<<", "<<BUILD_INFO
<<std::endl;
diff --git a/src/servermain.cpp b/src/servermain.cpp index 146c548c5..b8fb9ba2b 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -162,7 +162,7 @@ int main(int argc, char *argv[]) BEGIN_DEBUG_EXCEPTION_HANDLER // Print startup message - dstream<<DTIME<<"minetest-c55" + dstream<<DTIME<<PROJECT_NAME << " with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST <<", "<<BUILD_INFO <<std::endl; |