mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-08 09:26:27 +02:00
Code Issues Projects Releases Wiki Activity

Actual fix for DATADIR

Browse Source
This commit is contained in:
mathusummut
2019-04-04 23:25:28 +02:00
parent 73cc3dcf4e
commit aa7c0b4dca
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/platform/common/platform_common.h
View File

@@ -240,7 +240,7 @@ namespace Shared {
bool StartsWith(const std::string &str, const std::string &key); bool StartsWith(const std::string &str, const std::string &key);
bool EndsWith(const string &str, const string& key); bool EndsWith(const string &str, const string& key);
void endPathWithSlash(string &path, bool requireOSSlash = false); string endPathWithSlash(string &path, bool requireOSSlash = false);
void trimPathWithStartingSlash(string &path); void trimPathWithStartingSlash(string &path);
void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true); void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
string formatPath(string path); string formatPath(string path);

3
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@@ -552,7 +552,7 @@ namespace Shared {
return result; return result;
} }
void endPathWithSlash(string &path, bool requireOSSlash) { string endPathWithSlash(string &path, bool requireOSSlash) {
if (EndsWith(path, "/") == false && EndsWith(path, "\\") == false) { if (EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
string seperator = "/"; string seperator = "/";
if (requireOSSlash == true) { if (requireOSSlash == true) {
@@ -562,6 +562,7 @@ namespace Shared {
} }
path += seperator; path += seperator;
} }
return path
} }
string formatPath(string path) { string formatPath(string path) {

2
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -225,7 +225,7 @@ namespace Shared {
SDL_SetRelativeMouseMode(SDL_FALSE); SDL_SetRelativeMouseMode(SDL_FALSE);
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);
} }
#ifndef WIN32 #ifndef WIN32
string icon_file = ""; string icon_file = "";
#if defined(DATADIR) #if defined(DATADIR)