Updated.

modules/sdl2/SDL/include/SDL_config_linux.h

@@ -111,9 +111,7 @@
 
 #define HAVE_SEM_TIMEDWAIT 1
 
-#define SDL_AUDIO_DRIVER_DUMMY 1
 #define SDL_AUDIO_DRIVER_PULSEAUDIO 1
-//#define SDL_AUDIO_DRIVER_OSS 1
 
 #define SDL_INPUT_LINUXEV 1
 #define SDL_INPUT_TSLIB 1
@@ -128,23 +126,14 @@
 #define SDL_TIMER_UNIX 1
 #define SDL_FILESYSTEM_UNIX 1
 
-#define SDL_VIDEO_DRIVER_DUMMY 1
 #define SDL_VIDEO_DRIVER_X11 1
 
 #define SDL_VIDEO_DRIVER_X11_XINPUT2 1
 #define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
 
-#ifndef SDL_VIDEO_RENDER_OGL
-#define SDL_VIDEO_RENDER_OGL    0
-#endif
-
 /* Enable OpenGL support */
-#ifndef SDL_VIDEO_OPENGL
-#define SDL_VIDEO_OPENGL    1
-#endif
-#ifndef SDL_VIDEO_OPENGL_GLX
-#define SDL_VIDEO_OPENGL_GLX    1
-#endif
+#define SDL_VIDEO_OPENGL 1
+#define SDL_VIDEO_OPENGL_GLX 1
 
 #define SDL_ASSEMBLY_ROUTINES   1
 

modules/sdl2/makefile_linux.monkey2

@@ -8,16 +8,11 @@ Namespace sdl2
 #Import "<libXi.a>"
 #Import "<libpulse.a>"
 
-'source files
+'atomic
 #Import "SDL/src/atomic/SDL_atomic.c"
 #Import "SDL/src/atomic/SDL_spinlock.c"
 
-#Import "SDL/src/audio/disk/SDL_diskaudio.c"
-
-#Import "SDL/src/audio/dummy/SDL_dummyaudio.c"
-#Import "SDL/src/audio/pulseaudio/SDL_pulseaudio.c"
-'#Import "SDL/src/audio/dsp/SDL_dspaudio.c"
-
+'audio
 #Import "SDL/src/audio/SDL_audio.c"
 #Import "SDL/src/audio/SDL_audiocvt.c"
 #Import "SDL/src/audio/SDL_audiodev.c"
@@ -25,10 +20,15 @@ Namespace sdl2
 #Import "SDL/src/audio/SDL_mixer.c"
 #Import "SDL/src/audio/SDL_wave.c"
 
+#Import "SDL/src/audio/pulseaudio/SDL_pulseaudio.c"
+
+'cpuinfo
 #Import "SDL/src/cpuinfo/SDL_cpuinfo.c"
 
+'dynapi
 #Import "SDL/src/dynapi/SDL_dynapi.c"
 
+'events
 #Import "SDL/src/events/SDL_clipboardevents.c"
 #Import "SDL/src/events/SDL_dropevents.c"
 #Import "SDL/src/events/SDL_events.c"
@@ -39,27 +39,34 @@ Namespace sdl2
 #Import "SDL/src/events/SDL_touch.c"
 #Import "SDL/src/events/SDL_windowevents.c"
 
+'filesystem
 #Import "SDL/src/filesystem/unix/SDL_sysfilesystem.c"
 
+'file
 #Import "SDL/src/file/SDL_rwops.c"
 
-#Import "SDL/src/haptic/linux/SDL_syshaptic.c"
-
+'haptic
 #Import "SDL/src/haptic/SDL_haptic.c"
 
-#Import "SDL/src/joystick/linux/SDL_sysjoystick.c"
+#Import "SDL/src/haptic/linux/SDL_syshaptic.c"
 
+'joystick
 #Import "SDL/src/joystick/SDL_joystick.c"
 #Import "SDL/src/joystick/SDL_gamecontroller.c"
 
-#Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
+#Import "SDL/src/joystick/linux/SDL_sysjoystick.c"
 
-#Import "SDL/src/power/macosx/SDL_syspower.c"
+'loadso
+#Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 
+'power
 #Import "SDL/src/power/SDL_power.c"
 
-'#Import "SDL/src/render/opengl/SDL_render_gl.c"
-'#Import "SDL/src/render/opengl/SDL_shaders_gl.c"
+#Import "SDL/src/power/macosx/SDL_syspower.c"
+
+'render
+#Import "SDL/src/render/SDL_render.c"
+#Import "SDL/src/render/SDL_yuv_sw.c"
 
 #Import "SDL/src/render/software/SDL_blendfillrect.c"
 #Import "SDL/src/render/software/SDL_blendline.c"
@@ -69,10 +76,7 @@ Namespace sdl2
 #Import "SDL/src/render/software/SDL_render_sw.c"
 #Import "SDL/src/render/software/SDL_rotate.c"
 
-#Import "SDL/src/render/SDL_render.c"
-#Import "SDL/src/render/SDL_yuv_mmx.c"
-#Import "SDL/src/render/SDL_yuv_sw.c"
-
+'stdlib
 #Import "SDL/src/stdlib/SDL_getenv.c"
 #Import "SDL/src/stdlib/SDL_iconv.c"
 #Import "SDL/src/stdlib/SDL_malloc.c"
@@ -80,39 +84,21 @@ Namespace sdl2
 #Import "SDL/src/stdlib/SDL_stdlib.c"
 #Import "SDL/src/stdlib/SDL_string.c"
 
+'thread
+#Import "SDL/src/thread/SDL_thread.c"
+
 #Import "SDL/src/thread/pthread/SDL_syscond.c"
 #Import "SDL/src/thread/pthread/SDL_sysmutex.c"
 #Import "SDL/src/thread/pthread/SDL_syssem.c"
 #Import "SDL/src/thread/pthread/SDL_systhread.c"
 #Import "SDL/src/thread/pthread/SDL_systls.c"
 
-#Import "SDL/src/thread/SDL_thread.c"
-
-#Import "SDL/src/timer/unix/SDL_systimer.c"
-
+'timer
 #Import "SDL/src/timer/SDL_timer.c"
 
-#Import "SDL/src/video/dummy/SDL_nullevents.c"
-#Import "SDL/src/video/dummy/SDL_nullframebuffer.c"
-#Import "SDL/src/video/dummy/SDL_nullvideo.c"
-
-#Import "SDL/src/video/x11/imKStoUCS.c"
-#Import "SDL/src/video/x11/SDL_x11clipboard.c"
-#Import "SDL/src/video/x11/SDL_x11dyn.c"
-#Import "SDL/src/video/x11/SDL_x11events.c"
-#Import "SDL/src/video/x11/SDL_x11framebuffer.c"
-#Import "SDL/src/video/x11/SDL_x11keyboard.c"
-#Import "SDL/src/video/x11/SDL_x11messagebox.c"
-#Import "SDL/src/video/x11/SDL_x11modes.c"
-#Import "SDL/src/video/x11/SDL_x11mouse.c"
-#Import "SDL/src/video/x11/SDL_x11opengl.c"
-#Import "SDL/src/video/x11/SDL_x11opengles.c"
-#Import "SDL/src/video/x11/SDL_x11shape.c"
-#Import "SDL/src/video/x11/SDL_x11touch.c"
-#Import "SDL/src/video/x11/SDL_x11video.c"
-#Import "SDL/src/video/x11/SDL_x11window.c"
-#Import "SDL/src/video/x11/SDL_x11xinput2.c"
+#Import "SDL/src/timer/unix/SDL_systimer.c"
 
+'video
 #Import "SDL/src/video/SDL_blit.c"
 #Import "SDL/src/video/SDL_blit_0.c"
 #Import "SDL/src/video/SDL_blit_1.c"
@@ -132,10 +118,26 @@ Namespace sdl2
 #Import "SDL/src/video/SDL_surface.c"
 #Import "SDL/src/video/SDL_video.c"
 
+#Import "SDL/src/video/x11/imKStoUCS.c"
+#Import "SDL/src/video/x11/SDL_x11clipboard.c"
+#Import "SDL/src/video/x11/SDL_x11dyn.c"
+#Import "SDL/src/video/x11/SDL_x11events.c"
+#Import "SDL/src/video/x11/SDL_x11framebuffer.c"
+#Import "SDL/src/video/x11/SDL_x11keyboard.c"
+#Import "SDL/src/video/x11/SDL_x11messagebox.c"
+#Import "SDL/src/video/x11/SDL_x11modes.c"
+#Import "SDL/src/video/x11/SDL_x11mouse.c"
+#Import "SDL/src/video/x11/SDL_x11opengl.c"
+#Import "SDL/src/video/x11/SDL_x11opengles.c"
+#Import "SDL/src/video/x11/SDL_x11shape.c"
+#Import "SDL/src/video/x11/SDL_x11touch.c"
+#Import "SDL/src/video/x11/SDL_x11video.c"
+#Import "SDL/src/video/x11/SDL_x11window.c"
+#Import "SDL/src/video/x11/SDL_x11xinput2.c"
+
+'src
 #Import "SDL/src/SDL_assert.c"
 #Import "SDL/src/SDL_error.c"
 #Import "SDL/src/SDL_hints.c"
 #Import "SDL/src/SDL_log.c"
 #Import "SDL/src/SDL.c"
-
-'#Import "SDL/src/SDL_dataqueue.c"