piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc
2008-10-04 17:26:12 +00:00
parent 59b115d197
commit c7ae1fd402
20 changed files with 102 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -27,20 +27,15 @@
#include "VolumeCreator.h"
#include "Config.h"
#include "Core.h"
#ifdef USE_WX
#include "Frame.h"
#include "CodeWindow.h"
#endif
static std::string s_DataBasePath_EUR = "Data_EUR";
static std::string s_DataBasePath_USA = "Data_USA";
static std::string s_DataBasePath_JAP = "Data_JAP";
#ifdef USE_WX
extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow;
#endif
namespace BootManager
{
@ -51,8 +46,7 @@ extern "C" HINSTANCE wxGetInstance();
bool BootCore(const std::string& _rFilename)
{
SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
#ifdef USE_WX
if (g_pCodeWindow)
{
// StartUp.bUseDualCore = code_frame->UseDualCore();
@ -63,16 +57,11 @@ bool BootCore(const std::string& _rFilename)
// StartUp.bUseDualCore = false;
// StartUp.bUseJIT = true;
}
#endif
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename;
StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false;
#ifdef USE_WX
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
#else
StartUp.bEnableDebugging = false;
#endif
std::string BaseDataPath;
#ifdef _WIN32
StartUp.hInstance = wxGetInstance();
@ -95,10 +84,8 @@ bool BootCore(const std::string& _rFilename)
ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
}
#ifdef USE_WX
if(main_frame)
StartUp.hMainWindow = main_frame->GetRenderHandle();
#endif
// init the core
if (!Core::Init(StartUp))
@ -106,12 +93,8 @@ bool BootCore(const std::string& _rFilename)
PanicAlert("Couldn't init the core.\nCheck your configuration.");
return(false);
}
#ifdef USE_WX
Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);
#endif
return(true);
}