diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:16:47 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 16:16:47 +0300 |
| commit | 67a6bc4ab5be607c4a9f9a349dee629e864c2d42 (patch) | |
| tree | a07c396e114a21ccfede1bd9cd28470e1bd178b3 /src/porting.cpp | |
| parent | ef397dca7c4adb4216e5063a01a487889bf28abd (diff) | |
| download | minetest-67a6bc4ab5be607c4a9f9a349dee629e864c2d42.tar.xz | |
Fix map delete on windows (concatenate paths correctly with / or \ depending on OS)
Diffstat (limited to 'src/porting.cpp')
| -rw-r--r-- | src/porting.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/porting.cpp b/src/porting.cpp index 39b2c5705..217f0926e 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -87,8 +87,8 @@ void signal_handler_init(void) Path mangler */ -std::string path_data = "../data"; -std::string path_userdata = "../"; +std::string path_data = ".." DIR_DELIM "data"; +std::string path_userdata = ".."; void pathRemoveFile(char *path, char delim) { @@ -127,10 +127,10 @@ void initializePaths() pathRemoveFile(buf, '\\'); // Use "./bin/../data" - path_data = std::string(buf) + "/../data"; + path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data"; // Use "./bin/../" - path_userdata = std::string(buf) + "/../"; + path_userdata = std::string(buf) + DIR_DELIM ".." DIR_DELIM; /* Linux @@ -188,13 +188,13 @@ void initializePaths() pathRemoveFile(buf, '\\'); // Use "./bin/../data" - path_data = std::string(buf) + "/../data"; + path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data"; //path_data = std::string(buf) + "/../share/" + PROJECT_NAME; // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>" len = GetEnvironmentVariable("APPDATA", buf, buflen); assert(len < buflen); - path_userdata = std::string(buf) + "/" + PROJECT_NAME; + path_userdata = std::string(buf) + DIR_DELIM + PROJECT_NAME; /* Linux |