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

first step to get dolphin on osx 64 with a no wx version (WIP)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@924 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2008-10-20 17:32:15 +00:00
parent b6356df508
commit 03763372ac
12 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,15 +27,19 @@
#include "VolumeCreator.h"
#include "Config.h"
#include "Core.h"
#if !defined(_LP64) && !defined(__APPLE__)
#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";
#if !defined(_LP64) && !defined(__APPLE__)
extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow;
#endif
namespace BootManager
{
@ -47,6 +51,7 @@ bool BootCore(const std::string& _rFilename)
{
SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
#if !defined(_LP64) && !defined(__APPLE__)
if (g_pCodeWindow)
{
// StartUp.bUseDualCore = code_frame->UseDualCore();
@ -57,12 +62,15 @@ bool BootCore(const std::string& _rFilename)
// StartUp.bUseDualCore = false;
// StartUp.bUseJIT = true;
}
#endif //osx 64
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
StartUp.m_strFilename = _rFilename;
SConfig::GetInstance().m_LastFilename = StartUp.m_strFilename;
StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false;
#if !defined(_LP64) && !defined(__APPLE__)
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
#endif //osx 64
std::string BaseDataPath;
#ifdef _WIN32
StartUp.hInstance = wxGetInstance();
@ -85,9 +93,10 @@ bool BootCore(const std::string& _rFilename)
ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
}
#if !defined(_LP64) && !defined(__APPLE__)
if(main_frame)
StartUp.hMainWindow = main_frame->GetRenderHandle();
#endif
// init the core
if (!Core::Init(StartUp))
{
@ -95,7 +104,11 @@ bool BootCore(const std::string& _rFilename)
return(false);
}
#if !defined(_LP64) && !defined(__APPLE__)
Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);
#endif
return(true);
}