diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 7bf601afbf..8d9a305c29 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -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; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 5a213b5e92..2379c05e34 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -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), diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 46ec3976fe..29a08e7b5a 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -85,8 +85,6 @@ enum Hotkey struct SCoreStartupParameter { - void* hInstance; // HINSTANCE but we don't want to include - // Settings bool bEnableDebugging; #ifdef USE_GDBSTUB diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index 2d2587138e..202db8ab82 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -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(); diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 18a693fb82..0dfc76d01b 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -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(); diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index fccd2d3d92..c7d706814c 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -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()); diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index df9276bb59..eb9167599c 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -64,8 +64,6 @@ void* Host_GetRenderHandle() return nullptr; } -void* Host_GetInstance() { return nullptr; } - void Host_UpdateTitle(const std::string& title){}; void Host_UpdateLogDisplay(){}