mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-14 00:09:24 +01:00
Attempt at fixing Linux build. The OpenGL configuration dialog is
broken, though, so I'm not sure if this is quite right. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2378 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9ec81d4bf0
commit
a32e29aaa5
@ -105,17 +105,19 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals)
|
|||||||
|
|
||||||
void DllConfig(HWND _hParent)
|
void DllConfig(HWND _hParent)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
|
||||||
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
// This is needed because now we use wxEntryCleanup() when closing the configuration window
|
// This is needed because now we use wxEntryCleanup() when closing the configuration window
|
||||||
if (!wxTheApp || !wxTheApp->CallOnInit())
|
if (!wxTheApp || !wxTheApp->CallOnInit())
|
||||||
{
|
{
|
||||||
|
#if defined(_WIN32)
|
||||||
wxSetInstance((HINSTANCE)g_hInstance);
|
wxSetInstance((HINSTANCE)g_hInstance);
|
||||||
|
#endif
|
||||||
int argc = 0;
|
int argc = 0;
|
||||||
char **argv = NULL;
|
char **argv = NULL;
|
||||||
wxEntryStart(argc, argv);
|
wxEntryStart(argc, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Console::Open();
|
//Console::Open();
|
||||||
|
|
||||||
#if defined(_WIN32) && defined(HAVE_WX) && HAVE_WX
|
#if defined(_WIN32) && defined(HAVE_WX) && HAVE_WX
|
||||||
|
Loading…
x
Reference in New Issue
Block a user