WIP SDL2 tweaks for android.

modules/sdl2/SDL/include/SDL_config_linux.h

@@ -135,7 +135,7 @@
 #define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
 
 #ifndef SDL_VIDEO_RENDER_OGL
-#define SDL_VIDEO_RENDER_OGL    1
+#define SDL_VIDEO_RENDER_OGL    0
 #endif
 
 /* Enable OpenGL support */

modules/sdl2/makefile_android.monkey2

@@ -6,3 +6,114 @@ Namespace sdl2
 #Import "SDL/jniLibs/armeabi-v7a/libSDL2.so"
 
 #Import "SDL/src/main/android/SDL_android_main.c"
+
+#rem
+
+#Import "SDL/src/audio/SDL_audio.c"
+#Import "SDL/src/audio/SDL_audiocvt.c"
+#Import "SDL/src/audio/SDL_audiodev.c"
+#Import "SDL/src/audio/SDL_audiotypecvt.c"
+#Import "SDL/src/audio/SDL_mixer.c"
+#Import "SDL/src/audio/SDL_wave.c"
+#Import "SDL/src/audio/android/SDL_androidaudio.c"
+#Import "SDL/src/audio/dummy/SDL_dummyaudio.c"
+
+#Import "SDL/src/atomic/SDL_atomic.c"
+#Import "SDL/src/atomic/SDL_spinlock.c"
+
+#Import "SDL/src/cpuinfo/SDL_cpuinfo.c"
+
+#Import "SDL/src/dynapi/SDL_dynapi.c"
+
+#Import "SDL/src/events/SDL_clipboardevents.c"
+#Import "SDL/src/events/SDL_dropevents.c"
+#Import "SDL/src/events/SDL_events.c"
+#Import "SDL/src/events/SDL_gesture.c"
+#Import "SDL/src/events/SDL_keyboard.c"
+#Import "SDL/src/events/SDL_mouse.c"
+#Import "SDL/src/events/SDL_quit.c"
+#Import "SDL/src/events/SDL_touch.c"
+#Import "SDL/src/events/SDL_windowevents.c"
+
+#Import "SDL/src/file/SDL_rwops.c"
+
+#Import "SDL/src/filesystem/android/SDL_sysfilesystem.c"
+
+#Import "SDL/src/haptic/SDL_haptic.c"
+#Import "SDL/src/haptic/dummy/SDL_syshaptic.c"
+
+#Import "SDL/src/joystick/SDL_joystick.c"
+#Import "SDL/src/joystick/SDL_gamecontroller.c"
+#Import "SDL/src/joystick/android/SDL_sysjoystick.c"
+
+#Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
+
+#Import "SDL/src/power/SDL_power.c"
+#Import "SDL/src/power/android/SDL_syspower.c"
+
+#Import "SDL/src/render/SDL_render.c"
+#Import "SDL/src/render/SDL_yuv_mmx.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"
+#Import "SDL/src/render/software/SDL_blendpoint.c"
+#Import "SDL/src/render/software/SDL_drawline.c"
+#Import "SDL/src/render/software/SDL_drawpoint.c"
+#Import "SDL/src/render/software/SDL_render_sw.c"
+#Import "SDL/src/render/software/SDL_rotate.c"
+
+#Import "SDL/src/stdlib/SDL_getenv.c"
+#Import "SDL/src/stdlib/SDL_iconv.c"
+#Import "SDL/src/stdlib/SDL_malloc.c"
+#Import "SDL/src/stdlib/SDL_qsort.c"
+#Import "SDL/src/stdlib/SDL_stdlib.c"
+#Import "SDL/src/stdlib/SDL_string.c"
+
+#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/timer/SDL_timer.c"
+#Import "SDL/src/timer/unix/SDL_systimer.c"
+
+#Import "SDL/src/video/SDL_blit.c"
+#Import "SDL/src/video/SDL_blit_0.c"
+#Import "SDL/src/video/SDL_blit_1.c"
+#Import "SDL/src/video/SDL_blit_A.c"
+#Import "SDL/src/video/SDL_blit_auto.c"
+#Import "SDL/src/video/SDL_blit_copy.c"
+#Import "SDL/src/video/SDL_blit_N.c"
+#Import "SDL/src/video/SDL_blit_slow.c"
+#Import "SDL/src/video/SDL_bmp.c"
+#Import "SDL/src/video/SDL_clipboard.c"
+#Import "SDL/src/video/SDL_fillrect.c"
+#Import "SDL/src/video/SDL_pixels.c"
+#Import "SDL/src/video/SDL_rect.c"
+#Import "SDL/src/video/SDL_RLEaccel.c"
+#Import "SDL/src/video/SDL_shape.c"
+#Import "SDL/src/video/SDL_stretch.c"
+#Import "SDL/src/video/SDL_surface.c"
+#Import "SDL/src/video/SDL_video.c"
+#Import "SDL/src/video/android/SDL_androidclipboard.c"
+#Import "SDL/src/video/android/SDL_androidevents.c"
+#Import "SDL/src/video/android/SDL_androidgl.c"
+#Import "SDL/src/video/android/SDL_androidkeyboard.c"
+#Import "SDL/src/video/android/SDL_androidmessagebox.c"
+#Import "SDL/src/video/android/SDL_androidmouse.c"
+#Import "SDL/src/video/android/SDL_androidtouch.c"
+#Import "SDL/src/video/android/SDL_androidvideo.c"
+#Import "SDL/src/video/android/SDL_androidwindow.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/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"
+
+#end

modules/sdl2/makefile_linux.monkey2

@@ -58,8 +58,8 @@ Namespace sdl2
 
 #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/render/opengl/SDL_render_gl.c"
+'#Import "SDL/src/render/opengl/SDL_shaders_gl.c"
 
 #Import "SDL/src/render/software/SDL_blendfillrect.c"
 #Import "SDL/src/render/software/SDL_blendline.c"

modules/sdl2/sdl2.monkey2

@@ -13,11 +13,6 @@ Using libc
 
 Extern
 
-Struct SDL_RWops
-End
-
-Function SDL_RWFromMem:SDL_RWops Ptr( mem:Void Ptr,size:Int )
-
 Struct SDL_Surface
 End
 
@@ -29,6 +24,24 @@ Const SDL_TRUE:SDL_bool
 
 '${EXTERN}
 
+'FILE="sdl2/SDL_rwops.h"
+Struct SDL_RWops
+End
+
+Const RW_SEEK_SET:Int
+Const RW_SEEK_CUR:Int
+Const RW_SEEK_END:Int
+
+Function SDL_RWFromMem:SDL_RWops Ptr( mem:Void Ptr,size:Int )
+Function SDL_RWFromFile:SDL_RWops Ptr( file:CString,mode:CString )
+
+Function SDL_RWsize:Long( ops:SDL_RWops Ptr )
+Function SDL_RWtell:Long( ops:SDL_RWops Ptr )
+Function SDL_RWseek:Long( ops:SDL_RWops Ptr,offset:Long,whence:Int )
+Function SDL_RWread:Long( ops:SDL_RWops Ptr,buf:Void Ptr,size:Long,count:Long )
+Function SDL_RWwrite:Long( ops:SDL_RWops Ptr,buf:Void Ptr,size:Long,count:Long )
+Function SDL_RWclose:Int( ops:SDL_RWops Ptr )
+
 'FILE=sdl2/SDL_hints.h
 
 Function SDL_SetHint( name:CString,value:CString )