diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake_config.h.in | 1 | ||||
| -rw-r--r-- | src/config.h | 1 | ||||
| -rw-r--r-- | src/gettext.cpp | 5 | ||||
| -rw-r--r-- | src/porting.cpp | 15 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in index 7d446d178..c37858509 100644 --- a/src/cmake_config.h.in +++ b/src/cmake_config.h.in @@ -4,6 +4,7 @@ #define CMAKE_CONFIG_H #define PROJECT_NAME "@PROJECT_NAME@" +#define PROJECT_NAME_LOWER "@PROJECT_NAME_LOWER@" #define VERSION_MAJOR @VERSION_MAJOR@ #define VERSION_MINOR @VERSION_MINOR@ #define VERSION_PATCH @VERSION_PATCH@ diff --git a/src/config.h b/src/config.h index df7429be0..8f475fce4 100644 --- a/src/config.h +++ b/src/config.h @@ -14,6 +14,7 @@ #include "cmake_config.h" #elif defined (__ANDROID__) || defined (ANDROID) #define PROJECT_NAME "Minetest" + #define PROJECT_NAME_LOWER "minetest" #define STATIC_SHAREDIR "" #include "android_version.h" #ifdef NDEBUG diff --git a/src/gettext.cpp b/src/gettext.cpp index 509d506d4..85455ad3c 100644 --- a/src/gettext.cpp +++ b/src/gettext.cpp @@ -236,9 +236,8 @@ void init_gettext(const char *path, const std::string &configured_language) { #endif #endif - static std::string name = lowercase(PROJECT_NAME); - bindtextdomain(name.c_str(), path); - textdomain(name.c_str()); + bindtextdomain(PROJECT_NAME_LOWER, path); + textdomain(PROJECT_NAME_LOWER); #if defined(_WIN32) // Set character encoding for Win32 diff --git a/src/porting.cpp b/src/porting.cpp index eb7fea94c..8ea61f7cc 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -478,11 +478,11 @@ bool setSystemPaths() // Use ".\bin\.." path_share = std::string(buf) + "\\.."; - // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>" + // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME_LOWER>" DWORD len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf)); FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA"); - path_user = std::string(buf) + DIR_DELIM + lowercase(PROJECT_NAME); + path_user = std::string(buf) + DIR_DELIM PROJECT_NAME_LOWER; return true; } @@ -514,7 +514,7 @@ bool setSystemPaths() trylist.push_back(static_sharedir); trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share" - DIR_DELIM + lowercase(PROJECT_NAME)); + DIR_DELIM PROJECT_NAME_LOWER); trylist.push_back(bindir + DIR_DELIM ".."); #ifdef __ANDROID__ @@ -543,7 +543,7 @@ bool setSystemPaths() #ifndef __ANDROID__ path_user = std::string(getenv("HOME")) + DIR_DELIM "." - + lowercase(PROJECT_NAME); + PROJECT_NAME_LOWER; #endif return true; @@ -566,9 +566,8 @@ bool setSystemPaths() } CFRelease(resources_url); - path_user = std::string(getenv("HOME")) - + "/Library/Application Support/" - + lowercase(PROJECT_NAME); + path_user = std::string(getenv("HOME")) + + "/Library/Application Support/" PROJECT_NAME_LOWER; return true; } @@ -579,7 +578,7 @@ bool setSystemPaths() { path_share = STATIC_SHAREDIR; path_user = std::string(getenv("HOME")) + DIR_DELIM "." - + lowercase(PROJECT_NAME); + PROJECT_NAME_LOWER; return true; } |