diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-16 19:17:35 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-16 19:17:35 +0000 |
| commit | 697480f5cc747c8777c6c3f97de032f6586fbd2c (patch) | |
| tree | a6142db65dd12cd4bf5a25aa9f050391830aeb56 /Source/Plugins/Plugin_VideoSoftware | |
| parent | aa998896aceaafe3b8d7e518af5bb8beedfa20c9 (diff) | |
Remove long-rotted vestiges of SDL video output.
Use SDL for input devices only on Windows and Linux.
(Still globally enabled for the legacy Wiimote plugin.)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5886 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h | 3 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h index a69307cafb..4cf5aae72a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h @@ -47,9 +47,6 @@ #define I_NEED_OS2_H // HAXXOR #include <GL/glxew.h> #include <X11/XKBlib.h> -#elif defined(USE_SDL) && USE_SDL -#include <GL/glew.h> -#include <SDL.h> #else #include <GL/glew.h> #endif // end USE_WX diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 9143a22c3a..cceb2914d9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -39,7 +39,7 @@ files = [ linkFlags = [ ] libs = [ - 'videocommon', 'GLEW', 'SDL', 'SOIL', 'common' + 'videocommon', 'GLEW', 'SOIL', 'common' ] gfxenv = env.Clone() |