The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert accidental change to OpenGL's Config.cpp

Browse Source 
fix jitil building
fix win32 debugfast building

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3574 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-06-28 16:47:14 +00:00
parent 04105baf4e
commit e4af896638
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/PowerPC/Jit64IL/Jit.cpp
View File

@ -25,7 +25,6 @@
#include "../../Core.h" #include "../../Core.h"
#include "../../PatchEngine.h" #include "../../PatchEngine.h"
#include "../../CoreTiming.h" #include "../../CoreTiming.h"
#include "../../Debugger/Debugger_BreakPoints.h"
#include "../PowerPC.h" #include "../PowerPC.h"
#include "../Profiler.h" #include "../Profiler.h"
#include "../PPCTables.h" #include "../PPCTables.h"

4
Source/Dolphin.sln
View File

@ -662,8 +662,8 @@ Global
{F81AE75C-3D17-4D8C-A201-82FA5351C123}.Debug|Win32.Build.0 = Debug|Win32 {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.ActiveCfg = Debug|x64
{F81AE75C-3D17-4D8C-A201-82FA5351C123}.Debug|x64.Build.0 = 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.ActiveCfg = DebugFast|Win32
{F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|Win32.Build.0 = Debug|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.ActiveCfg = DebugFast|x64
{F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|x64.Build.0 = DebugFast|x64 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.DebugFast|x64.Build.0 = DebugFast|x64
{F81AE75C-3D17-4D8C-A201-82FA5351C123}.Release_JITIL|Win32.ActiveCfg = Release|Win32 {F81AE75C-3D17-4D8C-A201-82FA5351C123}.Release_JITIL|Win32.ActiveCfg = Release|Win32

5
Source/Plugins/Plugin_VideoOGL/Src/Config.cpp
View File

@ -90,8 +90,8 @@ void Config::Load()
SetEnableAlert(bTmp); SetEnableAlert(bTmp);
} }
void Config::GameIniLoad() { void Config::GameIniLoad()
return; {
IniFile *iniFile = ((struct SConfig *)globals->config)->m_LocalCoreStartupParameter.gameIni; IniFile *iniFile = ((struct SConfig *)globals->config)->m_LocalCoreStartupParameter.gameIni;
if (! iniFile) if (! iniFile)
return; return;
@ -179,4 +179,3 @@ void Config::Save()
iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini"); iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini");
} }