diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2012-12-26 12:54:58 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2012-12-26 12:54:58 -0600 |
| commit | 67c1c6b06247e8c3a91f1579d9d7637a4e892a7a (patch) | |
| tree | a040fa716f03f2a415d2f5fd42bc1a9494a81a8c /Source/Core/Common/Src/VideoBackendBase.cpp | |
| parent | 0de073edead76770aaa3b05638d3ebaa5d5f64f8 (diff) | |
| parent | 5169804a61841fdbce939538915f35d3df1acce1 (diff) | |
Merge branch 'GLES-software'
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(); |