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

DataDir fix

Browse Source
This commit is contained in:
mathusummut
2018-11-07 19:04:22 +01:00
parent dec899a524
commit dc1d00bce6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/shared_lib/sources/util/properties.cpp
View File

@@ -262,17 +262,17 @@ namespace Shared {
mapTagReplacementValues["%%APPLICATIONPATH%%"] = Properties::applicationPath; mapTagReplacementValues["%%APPLICATIONPATH%%"] = Properties::applicationPath;
mapTagReplacementValues["{APPLICATIONPATH}"] = Properties::applicationPath; mapTagReplacementValues["{APPLICATIONPATH}"] = Properties::applicationPath;
#if defined(DATADIR) /*#if defined(DATADIR)
mapTagReplacementValues["$APPLICATIONDATAPATH"] = formatPath(TOSTRING(DATADIR)); mapTagReplacementValues["$APPLICATIONDATAPATH"] = formatPath(TOSTRING(DATADIR));
mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = formatPath(TOSTRING(DATADIR)); mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = formatPath(TOSTRING(DATADIR));
mapTagReplacementValues["{APPLICATIONDATAPATH}"] = formatPath(TOSTRING(DATADIR)); mapTagReplacementValues["{APPLICATIONDATAPATH}"] = formatPath(TOSTRING(DATADIR));
#else #else*/
mapTagReplacementValues["$APPLICATIONDATAPATH"] = Properties::applicationDataPath; mapTagReplacementValues["$APPLICATIONDATAPATH"] = Properties::applicationDataPath;
mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = Properties::applicationDataPath; mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = Properties::applicationDataPath;
mapTagReplacementValues["{APPLICATIONDATAPATH}"] = Properties::applicationDataPath; mapTagReplacementValues["{APPLICATIONDATAPATH}"] = Properties::applicationDataPath;
#endif //#endif
mapTagReplacementValues["{TECHTREEPATH}"] = Properties::techtreePath; mapTagReplacementValues["{TECHTREEPATH}"] = Properties::techtreePath;
mapTagReplacementValues["{SCENARIOPATH}"] = Properties::scenarioPath; mapTagReplacementValues["{SCENARIOPATH}"] = Properties::scenarioPath;
@@ -395,17 +395,17 @@ namespace Shared {
replaceAll(value, "%%APPLICATIONPATH%%", Properties::applicationPath); replaceAll(value, "%%APPLICATIONPATH%%", Properties::applicationPath);
replaceAll(value, "{APPLICATIONPATH}", Properties::applicationPath); replaceAll(value, "{APPLICATIONPATH}", Properties::applicationPath);
#if defined(DATADIR) /*#if defined(DATADIR)
replaceAll(value, "$APPLICATIONDATAPATH", formatPath(TOSTRING(DATADIR))); replaceAll(value, "$APPLICATIONDATAPATH", formatPath(TOSTRING(DATADIR)));
replaceAll(value, "%%APPLICATIONDATAPATH%%", formatPath(TOSTRING(DATADIR))); replaceAll(value, "%%APPLICATIONDATAPATH%%", formatPath(TOSTRING(DATADIR)));
replaceAll(value, "{APPLICATIONDATAPATH}", formatPath(TOSTRING(DATADIR))); replaceAll(value, "{APPLICATIONDATAPATH}", formatPath(TOSTRING(DATADIR)));
#else #else*/
replaceAll(value, "$APPLICATIONDATAPATH", Properties::applicationDataPath); replaceAll(value, "$APPLICATIONDATAPATH", Properties::applicationDataPath);
replaceAll(value, "%%APPLICATIONDATAPATH%%", Properties::applicationDataPath); replaceAll(value, "%%APPLICATIONDATAPATH%%", Properties::applicationDataPath);
replaceAll(value, "{APPLICATIONDATAPATH}", Properties::applicationDataPath); replaceAll(value, "{APPLICATIONDATAPATH}", Properties::applicationDataPath);
#endif //#endif
replaceAll(value, "{TECHTREEPATH}", Properties::techtreePath); replaceAll(value, "{TECHTREEPATH}", Properties::techtreePath);
// if(value.find("{SCENARIOPATH}") != string::npos) { // if(value.find("{SCENARIOPATH}") != string::npos) {