Merge pull request #729 from lioncash/host-func

Core: Get rid of Host_GetInstance()
This commit is contained in:
Pierre Bourdon 2014-08-03 21:04:34 -07:00
commit 89adfba67b
7 changed files with 2 additions and 25 deletions

View File

@ -74,8 +74,6 @@ bool BootCore(const std::string& _rFilename)
StartUp.bRunCompareClient = false;
StartUp.bRunCompareServer = false;
StartUp.hInstance = Host_GetInstance();
// This is saved seperately from everything because it can be changed in SConfig::AutoSetup()
config_cache.bHLE_BS2 = StartUp.bHLE_BS2;

View File

@ -21,8 +21,7 @@
#include "DiscIO/VolumeCreator.h"
SCoreStartupParameter::SCoreStartupParameter()
: hInstance(nullptr),
bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
: bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
bJITNoBlockCache(false), bJITBlockLinking(true),
bJITOff(false),
bJITLoadStoreOff(false), bJITLoadStorelXzOff(false),

View File

@ -85,8 +85,6 @@ enum Hotkey
struct SCoreStartupParameter
{
void* hInstance; // HINSTANCE but we don't want to include <windows.h>
// Settings
bool bEnableDebugging;
#ifdef USE_GDBSTUB

View File

@ -43,6 +43,5 @@ void Host_UpdateMainFrame();
void Host_UpdateStatusBar(const std::string& text, int Filed = 0);
void Host_UpdateTitle(const std::string& title);
// TODO (neobrain): Remove these from host!
void* Host_GetInstance();
// TODO (neobrain): Remove this from host!
void* Host_GetRenderHandle();

View File

@ -524,19 +524,6 @@ void Host_Message(int Id)
main_frame->GetEventHandler()->AddPendingEvent(event);
}
#ifdef _WIN32
extern "C" HINSTANCE wxGetInstance();
void* Host_GetInstance()
{
return (void*)wxGetInstance();
}
#else
void* Host_GetInstance()
{
return nullptr;
}
#endif
void* Host_GetRenderHandle()
{
return main_frame->GetRenderHandle();

View File

@ -67,8 +67,6 @@ void* Host_GetRenderHandle()
return surf;
}
void* Host_GetInstance() { return nullptr; }
void Host_UpdateTitle(const std::string& title)
{
__android_log_write(ANDROID_LOG_INFO, DOLPHIN_TAG, title.c_str());

View File

@ -64,8 +64,6 @@ void* Host_GetRenderHandle()
return nullptr;
}
void* Host_GetInstance() { return nullptr; }
void Host_UpdateTitle(const std::string& title){};
void Host_UpdateLogDisplay(){}