From e4af896638484da17dcdfe112dba1c9287b85193 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 28 Jun 2009 16:47:14 +0000 Subject: [PATCH] revert accidental change to OpenGL's Config.cpp fix jitil building fix win32 debugfast building git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3574 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp | 1 - Source/Dolphin.sln | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/Config.cpp | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp index 6367a5b29d..52a519c708 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp @@ -25,7 +25,6 @@ #include "../../Core.h" #include "../../PatchEngine.h" #include "../../CoreTiming.h" -#include "../../Debugger/Debugger_BreakPoints.h" #include "../PowerPC.h" #include "../Profiler.h" #include "../PPCTables.h" diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 87336525e2..b6c21060bc 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -662,8 +662,8 @@ Global {F81AE75C-3D17-4D8C-A201-82FA5351C123}.Debug|Win32.Build.0 = Debug|Win32 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.Debug|x64.ActiveCfg = Debug|x64 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.Debug|x64.Build.0 = Debug|x64 - {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|Win32.ActiveCfg = Debug|Win32 - {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|Win32.Build.0 = Debug|Win32 + {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|Win32.Build.0 = DebugFast|Win32 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|x64.ActiveCfg = DebugFast|x64 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|x64.Build.0 = DebugFast|x64 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.Release_JITIL|Win32.ActiveCfg = Release|Win32 diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp index 64918c3515..b098461ce2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp @@ -90,8 +90,8 @@ void Config::Load() SetEnableAlert(bTmp); } -void Config::GameIniLoad() { - return; +void Config::GameIniLoad() +{ IniFile *iniFile = ((struct SConfig *)globals->config)->m_LocalCoreStartupParameter.gameIni; if (! iniFile) return; @@ -179,4 +179,3 @@ void Config::Save() iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini"); } -