diff options
| author | magumagu9 <magumagu9@gmail.com> | 2009-02-22 22:04:31 +0000 |
|---|---|---|
| committer | magumagu9 <magumagu9@gmail.com> | 2009-02-22 22:04:31 +0000 |
| commit | a32e29aaa55da1a679223fe9e4153c2a2b5cdc33 (patch) | |
| tree | 69464f43dbba8fe3f4d1d02450d4155b7c83705f /Source | |
| parent | 9ec81d4bf0236be19c4b59f8fe09c601827af173 (diff) | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index b2adb237a9..7336bebde5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -105,17 +105,19 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) 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 if (!wxTheApp || !wxTheApp->CallOnInit()) { +#if defined(_WIN32) wxSetInstance((HINSTANCE)g_hInstance); +#endif int argc = 0; char **argv = NULL; wxEntryStart(argc, argv); } - #endif - +#endif //Console::Open(); #if defined(_WIN32) && defined(HAVE_WX) && HAVE_WX |