From feba09f7a3e8d8e9b1ea2fe0d666c5be82941096 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 2 Feb 2010 21:56:29 +0000 Subject: Linux global build. At least the basic footwork is done here. Basic usage: "sudo scons install=global install" Hopefully this doesn't break builds on Macs. I have tested this on linux and windows. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4994 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/SysConf.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Source/Core/Common/Src/SysConf.cpp') diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp index 13fb688a0d..3477770816 100644 --- a/Source/Core/Common/Src/SysConf.cpp +++ b/Source/Core/Common/Src/SysConf.cpp @@ -21,13 +21,17 @@ SysConf::SysConf() : m_IsValid(false) { -#if defined(__APPLE__) - if (LoadFromFile(File::GetSysConfDirectory())) -#else - if (LoadFromFile(WII_SYSCONF_FILE)) -#endif + if (LoadFromFile(File::GetUserPath(F_WIISYSCONF_IDX))) m_IsValid = true; } + +void SysConf::Reload() +{ + if (m_IsValid) + return; + if (LoadFromFile(File::GetUserPath(F_WIISYSCONF_IDX))) + m_IsValid = true; +} SysConf::~SysConf() { -- cgit v1.2.3