diff options
| author | Matthew Parlane <parlane@gmail.com> | 2012-12-29 17:47:52 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2012-12-29 17:47:52 +1300 |
| commit | 13bd235c1174f1291fedbf73f6bfd01c4dd81994 (patch) | |
| tree | 497e9a760a94efb6a69bee0a60bb1b8735152e32 /Source/Core/Common/Src/VideoBackendBase.cpp | |
| parent | de0798f4f7fb0d4010567351e34f658ab51348ef (diff) | |
| parent | e9d00bfeebb62d8b6c5627b959c9045914348775 (diff) | |
Merge branch 'master' into wii-usb
Diffstat (limited to 'Source/Core/Common/Src/VideoBackendBase.cpp')
| -rw-r--r-- | Source/Core/Common/Src/VideoBackendBase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 40bb0fc4ce..62bb42997f 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -22,7 +22,9 @@ #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif +#ifndef USE_GLES #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" +#endif #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" std::vector<VideoBackend*> g_available_video_backends; @@ -52,7 +54,9 @@ void VideoBackend::PopulateList() if (IsGteVista()) g_available_video_backends.push_back(new DX11::VideoBackend); #endif +#ifndef USE_GLES g_available_video_backends.push_back(new OGL::VideoBackend); +#endif g_available_video_backends.push_back(new SW::VideoSoftware); g_video_backend = g_available_video_backends.front(); |