pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only lowercase project name at compile time

master
ShadowNinja 2015-04-21 11:09:44 -04:00
parent e0eec201a1
commit 3be9787e64
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmake_config.h.in
View File

@ -4,6 +4,7 @@
#define CMAKE_CONFIG_H #define CMAKE_CONFIG_H
#define PROJECT_NAME "@PROJECT_NAME@" #define PROJECT_NAME "@PROJECT_NAME@"
#define PROJECT_NAME_LOWER "@PROJECT_NAME_LOWER@"
#define VERSION_MAJOR @VERSION_MAJOR@ #define VERSION_MAJOR @VERSION_MAJOR@
#define VERSION_MINOR @VERSION_MINOR@ #define VERSION_MINOR @VERSION_MINOR@
#define VERSION_PATCH @VERSION_PATCH@ #define VERSION_PATCH @VERSION_PATCH@

1
src/config.h
View File

@ -14,6 +14,7 @@
#include "cmake_config.h" #include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID) #elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "Minetest" #define PROJECT_NAME "Minetest"
#define PROJECT_NAME_LOWER "minetest"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#include "android_version.h" #include "android_version.h"
#ifdef NDEBUG #ifdef NDEBUG

5
src/gettext.cpp
View File

@ -236,9 +236,8 @@ void init_gettext(const char *path, const std::string &configured_language) {
#endif #endif
#endif #endif
static std::string name = lowercase(PROJECT_NAME); bindtextdomain(PROJECT_NAME_LOWER, path);
bindtextdomain(name.c_str(), path); textdomain(PROJECT_NAME_LOWER);
textdomain(name.c_str());
#if defined(_WIN32) #if defined(_WIN32)
// Set character encoding for Win32 // Set character encoding for Win32

15
src/porting.cpp
View File

@ -478,11 +478,11 @@ bool setSystemPaths()
// Use ".\bin\.." // Use ".\bin\.."
path_share = std::string(buf) + "\\.."; 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)); DWORD len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf));
FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA"); 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; return true;
} }
@ -514,7 +514,7 @@ bool setSystemPaths()
trylist.push_back(static_sharedir); trylist.push_back(static_sharedir);
trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share" 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 ".."); trylist.push_back(bindir + DIR_DELIM "..");
#ifdef __ANDROID__ #ifdef __ANDROID__
@ -543,7 +543,7 @@ bool setSystemPaths()
#ifndef __ANDROID__ #ifndef __ANDROID__
path_user = std::string(getenv("HOME")) + DIR_DELIM "." path_user = std::string(getenv("HOME")) + DIR_DELIM "."
+ lowercase(PROJECT_NAME); PROJECT_NAME_LOWER;
#endif #endif
return true; return true;
@ -566,9 +566,8 @@ bool setSystemPaths()
} }
CFRelease(resources_url); CFRelease(resources_url);
path_user = std::string(getenv("HOME")) path_user = std::string(getenv("HOME")) +
+ "/Library/Application Support/" "/Library/Application Support/" PROJECT_NAME_LOWER;
+ lowercase(PROJECT_NAME);
return true; return true;
} }
@ -579,7 +578,7 @@ bool setSystemPaths()
{ {
path_share = STATIC_SHAREDIR; path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + DIR_DELIM "." path_user = std::string(getenv("HOME")) + DIR_DELIM "."
+ lowercase(PROJECT_NAME); PROJECT_NAME_LOWER;
return true; return true;
} }