mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 18:19:49 -06:00
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
This commit is contained in:
@ -45,10 +45,6 @@
|
||||
#include <X11/keysym.h>
|
||||
#include "Thread.h"
|
||||
|
||||
#elif defined(USE_SDL) && USE_SDL
|
||||
#include <GL/glew.h>
|
||||
#include <SDL.h>
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
#include <GL/glew.h>
|
||||
#include "cocoaGL.h"
|
||||
|
@ -28,7 +28,7 @@ files = [
|
||||
linkFlags = [
|
||||
]
|
||||
libs = [
|
||||
'videocommon', 'GLEW', 'SDL', 'SOIL', 'common'
|
||||
'videocommon', 'GLEW', 'SOIL', 'common'
|
||||
]
|
||||
|
||||
gfxenv = env.Clone()
|
||||
|
@ -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
|
||||
|
@ -39,7 +39,7 @@ files = [
|
||||
linkFlags = [
|
||||
]
|
||||
libs = [
|
||||
'videocommon', 'GLEW', 'SDL', 'SOIL', 'common'
|
||||
'videocommon', 'GLEW', 'SOIL', 'common'
|
||||
]
|
||||
|
||||
gfxenv = env.Clone()
|
||||
|
@ -19,12 +19,15 @@ files = [
|
||||
'WiimoteNew.cpp'
|
||||
]
|
||||
|
||||
libs = [ 'inputcommon', 'common', 'SDL' ]
|
||||
|
||||
cxxflags = [ ]
|
||||
|
||||
libs = [ 'inputcommon', 'common']
|
||||
|
||||
if sys.platform == 'win32' or sys.platform == 'linux2':
|
||||
libs += [ 'SDL' ]
|
||||
|
||||
if wiinewenv['HAVE_WX']:
|
||||
libs = [ 'inputuicommon' ] + libs
|
||||
libs += [ 'inputuicommon' ]
|
||||
files += [ 'WiimoteConfigDiag.cpp' ]
|
||||
|
||||
if wiinewenv['HAVE_WIIUSE']:
|
||||
|
Reference in New Issue
Block a user