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/VideoCommon/Src/VideoConfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/VideoConfig.cpp') diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 95c8981b1c..52f3c39357 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -21,6 +21,7 @@ #include "IniFile.h" #include "VideoConfig.h" #include "VideoCommon.h" +#include "FileUtil.h" VideoConfig g_Config; VideoConfig g_ActiveConfig; @@ -100,7 +101,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Hardware", "SimpleFB", &bSimpleFB, false); // Load common settings - iniFile.Load(CONFIG_FILE); + iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); bool bTmp; iniFile.Get("Interface", "UsePanicHandlers", &bTmp, true); SetEnableAlert(bTmp); -- cgit v1.2.3