Skip to content
Snippets Groups Projects
Commit 558d715b authored by sfan5's avatar sfan5
Browse files

Revert "Only lowercase project name at compile time"

This reverts commit 3be9787e.
parent 415167b2
No related branches found
No related tags found
No related merge requests found
......@@ -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@
......
......@@ -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
......
......@@ -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
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment