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

now core, padsimple and dsp null can be buil in 64bit on osx

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@947 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2008-10-24 15:48:36 +00:00
parent 63f3e1ab8c
commit a03f39ac36
11 changed files with 84 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
#include "VolumeCreator.h"
#include "Config.h"
#include "Core.h"
#if !defined(_LP64) && !defined(__APPLE__)
#if !defined(OSX64)
#include "Frame.h"
#include "CodeWindow.h"
#endif
@ -36,7 +36,7 @@ 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__)
#if !defined(OSX64)
extern CFrame* main_frame;
extern CCodeWindow* g_pCodeWindow;
#endif
@ -51,7 +51,7 @@ bool BootCore(const std::string& _rFilename)
{
SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;
#if !defined(_LP64) && !defined(__APPLE__)
#if !defined(OSX64)
if (g_pCodeWindow)
{
// StartUp.bUseDualCore = code_frame->UseDualCore();
@ -68,7 +68,7 @@ bool BootCore(const std::string& _rFilename)
SConfig::GetInstance().m_LastFilename = StartUp.m_strFilename;
StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false;
#if !defined(_LP64) && !defined(__APPLE__)
#if !defined(OSX64)
StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG
#endif //osx 64
std::string BaseDataPath;
@ -93,7 +93,7 @@ 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 !defined(OSX64)
if(main_frame)
StartUp.hMainWindow = main_frame->GetRenderHandle();
#endif
@ -104,7 +104,7 @@ bool BootCore(const std::string& _rFilename)
return(false);
}
#if !defined(_LP64) && !defined(__APPLE__)
#if !defined(OSX64)
Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);