summaryrefslogtreecommitdiff
path: root/src/porting.cpp
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2015-04-26 22:24:48 +0200
committersfan5 <sfan5@live.de>2015-04-27 16:24:49 +0200
commit558d715bf62b000c9b10b44a0e3591ed4e669fa5 (patch)
tree0af3b864b553ec876a956797d3097829ef4f6986 /src/porting.cpp
parent415167b228dea8b4108d7fe164c7fec8c061dcf5 (diff)
downloadminetest-558d715bf62b000c9b10b44a0e3591ed4e669fa5.tar.gz
minetest-558d715bf62b000c9b10b44a0e3591ed4e669fa5.tar.bz2
minetest-558d715bf62b000c9b10b44a0e3591ed4e669fa5.zip
Revert "Only lowercase project name at compile time"
This reverts commit 3be9787e64362b8a5020746220c65abbe31f8097.
Diffstat (limited to 'src/porting.cpp')
-rw-r--r--src/porting.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/porting.cpp b/src/porting.cpp
index ce35fe577..1fa451d10 100644
--- 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;
}