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/Software/SWmain.cpp | |
| parent | 7e83a0ea9be49abee3a4c8a2e953ca0905271434 (diff) | |
Move GLInterface around to remove VideoBackends dependency on DolphinWX
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index c4a6d2f0c8..7a0e88011f 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -12,9 +12,11 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/Host.h" #include "Core/HW/Memmap.h" #include "Core/HW/VideoInterface.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" @@ -65,10 +67,7 @@ std::string VideoSoftware::GetName() const void VideoSoftware::ShowConfig(void *_hParent) { -#if defined(HAVE_WX) && HAVE_WX - VideoConfigDialog diag((wxWindow*)_hParent, "Software", "gfx_software"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(_hParent, "Software", "gfx_software"); } bool VideoSoftware::Initialize(void *&window_handle) |