Updated.

modules/sdl2/README.TXT

@@ -1,5 +1,7 @@
 Upgrading SDL source:
 
-* include/config_*.h need to be copied/merged from current mx2 version - this is where SDL features are enabled.
+* include/config_*.h : need to be copied/merged - this is where SDL features are enabled.
 
-* include/begin_code.h should #define DECLSPEC to empty at top to be able to statically link without msvc generating .lib and .exp files due to dllimport/dllexport symbols. Seems to be no #define SDL_STATIC_BUILD here?
+* include/begin_code.h : #define DECLSPEC to empty at top to statically link without msvc generating .lib and .exp files due to dllimport/dllexport symbols. Seems to be no #define SDL_STATIC_BUILD here?
+
+* src/core/SDL_android.h/SDL_android.c : Android_JNI_GetAssetManager() added.

modules/sdl2/makefile_android.monkey2

@@ -3,172 +3,9 @@ Namespace sdl2
 
 #Import "<libdl.a>"
 
-'#Import "SDL/jniLibs/armeabi-v7a/libSDL2.so"
-
 #Import "SDL/src/main/android/SDL_android_main.c"
 
-#rem
-SDL.c                                
-SDL_assert.c                         
-SDL_error.c                          
-SDL_hints.c                          
-SDL_log.c                            
-SDL_audio.c                          
-SDL_audiocvt.c                       
-SDL_audiodev.c                       
-SDL_audiotypecvt.c                   
-SDL_mixer.c                          
-SDL_wave.c                           
-SDL_androidaudio.c                   
-SDL_dummyaudio.c                     
-SDL_atomic.c                         
-SDL_spinlock.c                       
-SDL_android.c                        
-SDL_cpuinfo.c                        
-SDL_dynapi.c                         
-SDL_clipboardevents.c                
-SDL_dropevents.c                     
-SDL_events.c                         
-SDL_gesture.c                        
-SDL_keyboard.c                       
-SDL_mouse.c                          
-SDL_quit.c                           
-SDL_touch.c                          
-SDL_windowevents.c                   
-SDL_rwops.c                          
-SDL_haptic.c                         
-SDL_syshaptic.c                      
-SDL_gamecontroller.c                 
-SDL_joystick.c                       
-SDL_sysjoystick.c                    
-SDL_sysloadso.c                      
-SDL_power.c                          
-SDL_syspower.c                       
-SDL_sysfilesystem.c                  
-SDL_d3dmath.c                        
-SDL_render.c                         
-SDL_yuv_mmx.c                        
-SDL_yuv_sw.c                         
-SDL_render_d3d.c                     
-SDL_render_d3d11.c                   
-SDL_render_gl.c                      
-SDL_shaders_gl.c                     
-SDL_render_gles.c                    
-SDL_render_gles2.c                   
-es2funcs.h: In function 'GLES2_LoadFu
-nder_gles2.c:294:45: warning: assignm
-ms) data->func=func;                 
-              ^                      
-es2funcs.h:56:1: note: in expansion o
- (GLuint, GLsizei, const GLchar* cons
-                                     
-SDL_shaders_gles2.c                  
-SDL_render_psp.c                     
-SDL_blendfillrect.c                  
-SDL_blendline.c                      
-SDL_blendpoint.c                     
-SDL_drawline.c                       
-SDL_drawpoint.c                      
-SDL_render_sw.c                      
-SDL_rotate.c                         
-SDL_getenv.c                         
-SDL_iconv.c                          
-SDL_malloc.c                         
-SDL_qsort.c                          
-SDL_stdlib.c                         
-SDL_string.c                         
-SDL_thread.c                         
-SDL_syscond.c                        
-SDL_sysmutex.c                       
-SDL_syssem.c                         
-SDL_systhread.c                      
-SDL_systls.c                         
-SDL_timer.c                          
-SDL_systimer.c                       
-SDL_RLEaccel.c                       
-SDL_blit.c                           
-SDL_blit_0.c                         
-SDL_blit_1.c                         
-SDL_blit_A.c                         
-SDL_blit_N.c                         
-SDL_blit_auto.c                      
-SDL_blit_copy.c                      
-SDL_blit_slow.c                      
-SDL_bmp.c                            
-SDL_clipboard.c                      
-SDL_egl.c                            
-SDL_fillrect.c                       
-SDL_pixels.c                         
-SDL_rect.c                           
-SDL_shape.c                          
-SDL_stretch.c                        
-SDL_surface.c                        
-SDL_video.c                          
-SDL_androidclipboard.c               
-SDL_androidevents.c                  
-SDL_androidgl.c                      
-SDL_androidkeyboard.c                
-SDL_androidmessagebox.c              
-SDL_androidmouse.c                   
-SDL_androidtouch.c                   
-SDL_androidvideo.c                   
-SDL_androidwindow.c                  
-SDL_test_assert.c                    
-SDL_test_common.c                    
-SDL_test_compare.c                   
-SDL_test_crc32.c                     
-SDL_test_font.c                      
-SDL_test_fuzzer.c                    
-SDL_test_harness.c                   
-SDL_test_imageBlit.c                 
-SDL_test_imageBlitBlend.c            
-SDL_test_imageFace.c                 
-SDL_test_imagePrimitives.c           
-SDL_test_imagePrimitivesBlend.c      
-SDL_test_log.c                       
-SDL_test_md5.c                       
-SDL_test_random.c                    
-#end
-
-#rem
-	$(wildcard $(LOCAL_PATH)/src/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
-	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
-	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
-	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/filesystem/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/test/*.c))
-
-#end
-
-#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"
-
+'audio
 #Import "SDL/src/audio/SDL_audio.c"
 #Import "SDL/src/audio/SDL_audiocvt.c"
 #Import "SDL/src/audio/SDL_audiodev.c"
@@ -178,15 +15,20 @@ SDL_test_random.c
 #Import "SDL/src/audio/android/SDL_androidaudio.c"
 #Import "SDL/src/audio/dummy/SDL_dummyaudio.c"
 
+'atomic
 #Import "SDL/src/atomic/SDL_atomic.c"
 #Import "SDL/src/atomic/SDL_spinlock.c"
 
+'core
 #Import "SDL/src/core/android/SDL_android.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"
@@ -197,39 +39,29 @@ SDL_test_random.c
 #Import "SDL/src/events/SDL_touch.c"
 #Import "SDL/src/events/SDL_windowevents.c"
 
+'file
 #Import "SDL/src/file/SDL_rwops.c"
 
+'filesystem
 #Import "SDL/src/filesystem/android/SDL_sysfilesystem.c"
 
+'haptic
 #Import "SDL/src/haptic/SDL_haptic.c"
 #Import "SDL/src/haptic/dummy/SDL_syshaptic.c"
 
+'joystick
 #Import "SDL/src/joystick/SDL_gamecontroller.c"
 #Import "SDL/src/joystick/SDL_joystick.c"
 #Import "SDL/src/joystick/android/SDL_sysjoystick.c"
 
+'loadso
 #Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 
+'power
 #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/opengl/SDL_render_gl.c"
-#Import "SDL/src/render/opengl/SDL_shaders_gl.c"
-#Import "SDL/src/render/opengles/SDL_render_gles.c"
-#Import "SDL/src/render/opengles2/SDL_render_gles2.c"
-#Import "SDL/src/render/opengles2/SDL_shaders_gles2.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"
-
+'stdlib
 #Import "SDL/src/stdlib/SDL_getenv.c"
 #Import "SDL/src/stdlib/SDL_iconv.c"
 #Import "SDL/src/stdlib/SDL_malloc.c"
@@ -237,6 +69,7 @@ SDL_test_random.c
 #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"
@@ -244,9 +77,23 @@ SDL_test_random.c
 #Import "SDL/src/thread/pthread/SDL_systhread.c"
 #Import "SDL/src/thread/pthread/SDL_systls.c"
 
+'timer
 #Import "SDL/src/timer/SDL_timer.c"
 #Import "SDL/src/timer/unix/SDL_systimer.c"
 
+'render - have to include software render?
+#Import "SDL/src/render/SDL_yuv_sw.c"
+#Import "SDL/src/render/SDL_render.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"
+
+'video
 #Import "SDL/src/video/SDL_blit.c"
 #Import "SDL/src/video/SDL_blit_0.c"
 #Import "SDL/src/video/SDL_blit_1.c"
@@ -266,6 +113,7 @@ SDL_test_random.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"
@@ -275,6 +123,10 @@ SDL_test_random.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"
+
+'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"

modules/sdl2/makefile_linux.monkey2

@@ -138,4 +138,4 @@ Namespace sdl2
 #Import "SDL/src/SDL_log.c"
 #Import "SDL/src/SDL.c"
 
-#Import "SDL/src/SDL_dataqueue.c"
+'#Import "SDL/src/SDL_dataqueue.c"

modules/sdl2/makefile_macos.monkey2

@@ -127,5 +127,5 @@ Namespace sdl2
 #Import "SDL/src/SDL_log.c"
 #Import "SDL/src/SDL.c"
 
-#Import "SDL/src/SDL_dataqueue.c"
+'#Import "SDL/src/SDL_dataqueue.c"
 	

modules/sdl2/makefile_windows.monkey2

@@ -16,17 +16,11 @@ Namespace sdl2
 #import "<libkernel32.a>"
 #import "<libversion.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/directsound/SDL_directsound.c"
-'#Import "SDL/src/audio/xaudio2/SDL_xaudio2.c"	'xaudio2.h is missing from MINGW?
-'#import "SDL/src/audio/winmm/SDL_winmm.c"
-
+'audio
 #Import "SDL/src/audio/SDL_audio.c"
 #Import "SDL/src/audio/SDL_audiocvt.c"
 #Import "SDL/src/audio/SDL_audiodev.c"
@@ -34,13 +28,21 @@ Namespace sdl2
 #Import "SDL/src/audio/SDL_mixer.c"
 #import "SDL/src/audio/SDL_wave.c"
 
+
+#Import "SDL/src/audio/directsound/SDL_directsound.c"
+#import "SDL/src/audio/dummy/SDL_dummyaudio.c"
+
+'core
 #import "SDL/src/core/windows/SDL_windows.c"
 #import "SDL/src/core/windows/SDL_xinput.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"
@@ -51,34 +53,40 @@ Namespace sdl2
 #import "SDL/src/events/SDL_touch.c"
 #import "SDL/src/events/SDL_windowevents.c"
 
+'filesystem
 #import "SDL/src/filesystem/windows/SDL_sysfilesystem.c"
 
+'file
 #import "SDL/src/file/SDL_rwops.c"
 
-#import "SDL/src/haptic/windows/SDL_dinputhaptic.c"
+'haptic
+#import "SDL/src/haptic/SDL_haptic.c"
+
 #import "SDL/src/haptic/windows/SDL_windowshaptic.c"
+#import "SDL/src/haptic/windows/SDL_dinputhaptic.c"
 #import "SDL/src/haptic/windows/SDL_xinputhaptic.c"
 
-#import "SDL/src/haptic/SDL_haptic.c"
+'joystick
+#import "SDL/src/joystick/SDL_joystick.c"
+#Import "SDL/src/joystick/SDL_gamecontroller.c"
 
-#import "SDL/src/joystick/windows/SDL_dinputjoystick.c"
-#import "SDL/src/joystick/windows/SDL_mmjoystick.c"
 #import "SDL/src/joystick/windows/SDL_windowsjoystick.c"
+#import "SDL/src/joystick/windows/SDL_dinputjoystick.c"
 #import "SDL/src/joystick/windows/SDL_xinputjoystick.c"
 
-#import "SDL/src/joystick/SDL_joystick.c"
-#Import "SDL/src/joystick/SDL_gamecontroller.c"
-
+'loadso
 #import "SDL/src/loadso/windows/SDL_sysloadso.c"
 
-#import "SDL/src/power/windows/SDL_syspower.c"
-
+'power
 #Import "SDL/src/power/SDL_power.c"
+#import "SDL/src/power/windows/SDL_syspower.c"
 
-'#Import "SDL/src/render/opengles2/SDL_render_gles2.c"
-'#Import "SDL/src/render/opengles2/SDL_shaders_gles2.c"
+'render
+#Import "SDL/src/render/SDL_d3dmath.c"
+#Import "SDL/src/render/SDL_render.c"
+#Import "SDL/src/render/SDL_yuv_mmx.c"
+#Import "SDL/src/render/SDL_yuv_sw.c"
 
-'Have to include SW renderer...?
 #Import "SDL/src/render/software/SDL_blendfillrect.c"
 #Import "SDL/src/render/software/SDL_blendline.c"
 #Import "SDL/src/render/software/SDL_blendpoint.c"
@@ -87,11 +95,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_d3dmath.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"
@@ -99,6 +103,9 @@ 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/generic/SDL_syscond.c"
 
 #Import "SDL/src/thread/windows/SDL_sysmutex.c"
@@ -106,29 +113,12 @@ Namespace sdl2
 #Import "SDL/src/thread/windows/SDL_systhread.c"
 #Import "SDL/src/thread/windows/SDL_systls.c"
 
-#Import "SDL/src/thread/SDL_thread.c"
-
-#import "SDL/src/timer/windows/SDL_systimer.c"
-
+'timer
 #import "SDL/src/timer/SDL_timer.c"
 
-#import "SDL/src/video/windows/SDL_windowsclipboard.c"
-#import "SDL/src/video/windows/SDL_windowsevents.c"
-#import "SDL/src/video/windows/SDL_windowsframebuffer.c"
-#import "SDL/src/video/windows/SDL_windowskeyboard.c"
-#import "SDL/src/video/windows/SDL_windowsmessagebox.c"
-#import "SDL/src/video/windows/SDL_windowsmodes.c"
-#import "SDL/src/video/windows/SDL_windowsmouse.c"
-#Import "SDL/src/video/windows/SDL_windowsopengl.c"
-#import "SDL/src/video/windows/SDL_windowsopengles.c"
-#import "SDL/src/video/windows/SDL_windowsshape.c"
-#import "SDL/src/video/windows/SDL_windowsvideo.c"
-#import "SDL/src/video/windows/SDL_windowswindow.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/timer/windows/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"
@@ -149,15 +139,29 @@ Namespace sdl2
 #import "SDL/src/video/SDL_surface.c"
 #import "SDL/src/video/SDL_video.c"
 
+#import "SDL/src/video/windows/SDL_windowsclipboard.c"
+#import "SDL/src/video/windows/SDL_windowsevents.c"
+#import "SDL/src/video/windows/SDL_windowsframebuffer.c"
+#import "SDL/src/video/windows/SDL_windowskeyboard.c"
+#import "SDL/src/video/windows/SDL_windowsmessagebox.c"
+#import "SDL/src/video/windows/SDL_windowsmodes.c"
+#import "SDL/src/video/windows/SDL_windowsmouse.c"
+#Import "SDL/src/video/windows/SDL_windowsopengl.c"
+#import "SDL/src/video/windows/SDL_windowsopengles.c"
+#import "SDL/src/video/windows/SDL_windowsshape.c"
+#import "SDL/src/video/windows/SDL_windowsvideo.c"
+#import "SDL/src/video/windows/SDL_windowswindow.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"
+'#Import "SDL/src/SDL_dataqueue.c"
 	
-'Really?!?...
+'really?!?...
 #Import "SDL/src/libm/e_atan2.c"
 #Import "SDL/src/libm/e_log.c"
 #Import "SDL/src/libm/e_pow.c"