gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Path now goes to some trouble to prevent mixing / and \ slashes (causes trouble when hotloading, and some Windows APIs can't handle it, either)

Browse Source 
WARNING: that means stuff like Path(nativeDataPath/"art/") is forbidden
and will raise errors on Windows when nativeDataPath contains \. always
use /"" to add a trailing slash. never embed "/" in OsPath component
strings (it's OK for VFS strings since they consistently use /).

wdir_watch, CmdLineArgs: avoid mixed separators
wutil: remove overzealous assertion (infinite recursion if an error
arose before we create a window)

refs #781

This was SVN commit r9424.
This commit is contained in:
janwas
2011-05-04 12:16:51 +00:00
parent 7523894760
commit a7152270f4
9 changed files with 113 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/GameSetup/Paths.cpp
+11 -11
View File
@@ -31,9 +31,9 @@ Paths::Paths(const CmdLineArgs& args)
m_root = Root(args.GetArg0());
#ifdef INSTALLED_DATADIR
m_rdata = WIDEN(STRINGIZE(INSTALLED_DATADIR)) L"/";
m_rdata = WIDEN(STRINGIZE(INSTALLED_DATADIR))/L"";
#else
m_rdata = m_root/"data/";
m_rdata = m_root/"data"/"";
#endif
const char* subdirectoryName = args.Has("writableRoot")? 0 : "0ad";
@@ -42,18 +42,18 @@ Paths::Paths(const CmdLineArgs& args)
if(!subdirectoryName)
{
m_data = m_rdata;
m_config = m_data/"config/";
m_cache = m_data/"cache/";
m_logs = m_root/"logs/";
m_config = m_data/"config"/"";
m_cache = m_data/"cache"/"";
m_logs = m_root/"logs"/"";
}
else
{
#if OS_WIN
const OsPath appdata = wutil_AppdataPath() / subdirectoryName/"";
m_data = appdata/"data/";
m_config = appdata/"config/";
m_cache = appdata/"cache/";
m_logs = appdata/"logs/";
m_data = appdata/"data"/"";
m_config = appdata/"config"/"";
m_cache = appdata/"cache"/"";
m_logs = appdata/"logs"/"";
#else
const char* envHome = getenv("HOME");
ENSURE(envHome);
@@ -63,8 +63,8 @@ Paths::Paths(const CmdLineArgs& args)
const OsPath xdgCache = XDG_Path("XDG_CACHE_HOME", home, home/".cache/" ) / subdirectoryName;
m_data = xdgData/"";
m_cache = xdgCache/"";
m_config = xdgConfig/"config/";
m_logs = xdgConfig/"logs/";
m_config = xdgConfig/"config"/"";
m_logs = xdgConfig/"logs"/"";
#endif
}
}