From e282d5c7f2a2b898bd2f4bf42efcbce827068c8d Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Fri, 29 Jan 2010 19:45:01 +0000 Subject: 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 --- Source/Core/Common/Src/FileUtil.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/Src/FileUtil.cpp') 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; } -- cgit v1.2.3