diff options
Diffstat (limited to 'Source/Core/DolphinWX/Src/BootManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/BootManager.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index 3a70652a1b..2bb708716d 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -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);
}
|