Skip to content
Permalink
Browse files

Only lowercase project name at compile time

  • Loading branch information
ShadowNinja committed Apr 22, 2015
1 parent e0eec20 commit 3be9787e64362b8a5020746220c65abbe31f8097
Showing with 11 additions and 11 deletions.
  1. +1 −0 src/cmake_config.h.in
  2. +1 −0 src/config.h
  3. +2 −3 src/gettext.cpp
  4. +7 −8 src/porting.cpp
@@ -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@
@@ -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
@@ -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
@@ -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;
}

0 comments on commit 3be9787

Please sign in to comment.