Revert "Only lowercase project name at compile time"

This reverts commit 3be9787e64362b8a5020746220c65abbe31f8097.

diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index c37858509853fcccf95c233c5a34dbb7f6a915a7..7d446d17872cb4928f6146f81e64114327b666d4 100644 (file)
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -4,7 +4,6 @@
 #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 8f475fce4a671a6d742d6f48dae470773d4c6401..df7429be0cb83c242a41efd6472096ad3f610ab7 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -14,7 +14,6 @@
        #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 85455ad3cb019785697b6b3284190b54e54ba581..509d506d42239230da033fda148931a08e67a786 100644 (file)
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -236,8 +236,9 @@ void init_gettext(const char *path, const std::string &configured_language) {
 #endif
 #endif
 
-       bindtextdomain(PROJECT_NAME_LOWER, path);
-       textdomain(PROJECT_NAME_LOWER);
+       static std::string name = lowercase(PROJECT_NAME);
+       bindtextdomain(name.c_str(), path);
+       textdomain(name.c_str());
 
 #if defined(_WIN32)
        // Set character encoding for Win32

diff --git a/src/porting.cpp b/src/porting.cpp
index ce35fe577180b863cf0b5fc1a0cf1bb0fc56355e..1fa451d10100dd85b8d47de8e0ac2a9a1a38d14d 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -475,11 +475,11 @@ bool setSystemPaths()
        // Use ".\bin\.."
        path_share = std::string(buf) + "\\..";
 
-       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME_LOWER>"
+       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        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 PROJECT_NAME_LOWER;
+       path_user = std::string(buf) + DIR_DELIM + lowercase(PROJECT_NAME);
        return true;
 }
 
@@ -511,7 +511,7 @@ bool setSystemPaths()
                trylist.push_back(static_sharedir);
 
        trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share"
-               DIR_DELIM PROJECT_NAME_LOWER);
+               DIR_DELIM + lowercase(PROJECT_NAME));
        trylist.push_back(bindir + DIR_DELIM "..");
 
 #ifdef __ANDROID__
@@ -540,7 +540,7 @@ bool setSystemPaths()
 
 #ifndef __ANDROID__
        path_user = std::string(getenv("HOME")) + DIR_DELIM "."
-               PROJECT_NAME_LOWER;
+               + lowercase(PROJECT_NAME);
 #endif
 
        return true;
@@ -563,8 +563,9 @@ bool setSystemPaths()
        }
        CFRelease(resources_url);
 
-       path_user = std::string(getenv("HOME")) +
-               "/Library/Application Support/" PROJECT_NAME_LOWER;
+       path_user = std::string(getenv("HOME"))
+               + "/Library/Application Support/"
+               + lowercase(PROJECT_NAME);
        return true;
 }
 
@@ -575,7 +576,7 @@ bool setSystemPaths()
 {
        path_share = STATIC_SHAREDIR;
        path_user  = std::string(getenv("HOME")) + DIR_DELIM "."
-               PROJECT_NAME_LOWER;
+               + lowercase(PROJECT_NAME);
        return true;
 }