diff options
| author | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-29 19:45:01 +0000 |
|---|---|---|
| committer | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-29 19:45:01 +0000 |
| commit | e282d5c7f2a2b898bd2f4bf42efcbce827068c8d (patch) | |
| tree | ccd7a7d36d1900a8483a73e44f4fb3bac2eb25c7 /Source/Core/Common/Src/FileUtil.cpp | |
| parent | 8b129fca0c23ce83172a01db143abae171bdd4c3 (diff) | |
Fixes Issue 2176 (SysConf on OSX), plus some initialization order warning fix in VolumeDirectory.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4985 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/FileUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/FileUtil.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 5cff7cc55c..86eada6035 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -512,14 +512,23 @@ bool SetCurrentDir(const char *_rDirectory) #if defined(__APPLE__) //get the full config dir -char *GetConfigDirectory() +const char *GetConfigDirectory() { - static char path[MAX_PATH] = {0}; if (strlen(path) > 0) return path; snprintf(path, sizeof(path), "%s" DIR_SEP CONFIG_FILE, GetUserDirectory()); return path; +} + +//get the full SYSCONF dir +const char *GetSysConfDirectory() +{ + static char path[MAX_PATH] = {0}; + if (strlen(path) > 0) + return path; + snprintf(path, sizeof(path), "%s" DIR_SEP WII_SYSCONF_FILE, GetUserDirectory()); + return path; } |