diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-01 23:21:03 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-02 09:34:39 -0700 |
| commit | 226a9c239220c5ba99508a6b96ce28903a35be80 (patch) | |
| tree | bd010cc5aed750806eba69994e004057599af035 /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | 7e83a0ea9be49abee3a4c8a2e953ca0905271434 (diff) | |
Move GLInterface around to remove VideoBackends dependency on DolphinWX
Diffstat (limited to 'Source/Core/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 8ee6471019..aa042c3405 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -49,6 +49,7 @@ Make AA apply instantly during gameplay if possible #include "Core/Host.h" #include "VideoBackends/OGL/FramebufferManager.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/PerfQuery.h" #include "VideoBackends/OGL/PostProcessing.h" @@ -82,11 +83,6 @@ Make AA apply instantly during gameplay if possible #include "Common/IniFile.h" #endif -#if defined(HAVE_WX) && HAVE_WX -#include "DolphinWX/VideoConfigDiag.h" -#include "DolphinWX/Debugger/DebuggerPanel.h" -#endif // HAVE_WX - namespace OGL { @@ -160,11 +156,8 @@ static void InitBackendInfo() void VideoBackend::ShowConfig(void *_hParent) { -#if defined(HAVE_WX) && HAVE_WX InitBackendInfo(); - VideoConfigDiag diag((wxWindow*)_hParent, "OpenGL", "gfx_opengl"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(_hParent, "OpenGL", "gfx_opengl"); } bool VideoBackend::Initialize(void *&window_handle) |
