diff --git a/jni/SDL2-2.0.3/.hg_archival.txt b/jni/SDL2-2.0.4/.hg_archival.txt similarity index 100% rename from jni/SDL2-2.0.3/.hg_archival.txt rename to jni/SDL2-2.0.4/.hg_archival.txt diff --git a/jni/SDL2-2.0.3/.hgignore b/jni/SDL2-2.0.4/.hgignore similarity index 100% rename from jni/SDL2-2.0.3/.hgignore rename to jni/SDL2-2.0.4/.hgignore diff --git a/jni/SDL2-2.0.3/.hgtags b/jni/SDL2-2.0.4/.hgtags similarity index 100% rename from jni/SDL2-2.0.3/.hgtags rename to jni/SDL2-2.0.4/.hgtags diff --git a/jni/SDL2-2.0.3/Android.mk b/jni/SDL2-2.0.4/Android.mk similarity index 100% rename from jni/SDL2-2.0.3/Android.mk rename to jni/SDL2-2.0.4/Android.mk diff --git a/jni/SDL2-2.0.3/BUGS.txt b/jni/SDL2-2.0.4/BUGS.txt similarity index 100% rename from jni/SDL2-2.0.3/BUGS.txt rename to jni/SDL2-2.0.4/BUGS.txt diff --git a/jni/SDL2-2.0.3/CMakeLists.txt b/jni/SDL2-2.0.4/CMakeLists.txt old mode 100644 new mode 100755 similarity index 94% rename from jni/SDL2-2.0.3/CMakeLists.txt rename to jni/SDL2-2.0.4/CMakeLists.txt index 4c75ad61..74356b60 --- a/jni/SDL2-2.0.3/CMakeLists.txt +++ b/jni/SDL2-2.0.4/CMakeLists.txt @@ -169,6 +169,13 @@ if(MSVC) endif() endforeach() endif() + + # Make sure /RTC1 is disabled, otherwise it will use functions from the CRT + foreach(flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO) + string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}") + endforeach(flag_var) endif() # Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config, @@ -382,7 +389,7 @@ if(USE_GCC OR USE_CLANG) set(CMAKE_REQUIRED_FLAGS "-Wl,--no-undefined") check_c_compiler_flag("" HAVE_NO_UNDEFINED) - set(CMAKE_REQUIRED_FLAGS) + set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) if(HAVE_NO_UNDEFINED) list(APPEND EXTRA_LDFLAGS "-Wl,--no-undefined") endif() @@ -688,6 +695,52 @@ if(SDL_VIDEO) endif() endif() +if(ANDROID) + file(GLOB ANDROID_CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_CORE_SOURCES}) + file(GLOB ANDROID_MAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_MAIN_SOURCES}) + if(SDL_AUDIO) + set(SDL_AUDIO_DRIVER_ANDROID 1) + file(GLOB ANDROID_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_AUDIO_SOURCES}) + set(HAVE_SDL_AUDIO TRUE) + endif() + if(SDL_FILESYSTEM) + set(SDL_FILESYSTEM_ANDROID 1) + file(GLOB ANDROID_FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_FILESYSTEM_SOURCES}) + set(HAVE_SDL_FILESYSTEM TRUE) + endif() + if(SDL_JOYSTICK) + set(SDL_JOYSTICK_ANDROID 1) + file(GLOB ANDROID_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_JOYSTICK_SOURCES}) + set(HAVE_SDL_JOYSTICK TRUE) + endif() + if(SDL_POWER) + set(SDL_POWER_ANDROID 1) + file(GLOB ANDROID_POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_POWER_SOURCES}) + set(HAVE_SDL_POWER TRUE) + endif() + if(SDL_VIDEO) + set(SDL_VIDEO_DRIVER_ANDROID 1) + file(GLOB ANDROID_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/android/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_VIDEO_SOURCES}) + set(HAVE_SDL_VIDEO TRUE) + + #enable gles + if(VIDEO_OPENGLES) + set(SDL_VIDEO_OPENGL_EGL 1) + set(HAVE_VIDEO_OPENGLES TRUE) + set(SDL_VIDEO_OPENGL_ES2 1) + set(SDL_VIDEO_RENDER_OGL_ES2 1) + endif() + endif() + list(APPEND EXTRA_LDFLAGS "-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit") +endif() + # Platform-specific options and settings if(EMSCRIPTEN) # Hide noisy warnings that intend to aid mostly during initial stages of porting a new @@ -826,7 +879,7 @@ elseif(UNIX AND NOT APPLE) if(SDL_JOYSTICK) CheckUSBHID() # seems to be BSD specific - limit the test to BSD only? - if(LINUX) + if(LINUX AND NOT ANDROID) set(SDL_JOYSTICK_LINUX 1) file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/linux/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) @@ -898,9 +951,20 @@ elseif(WINDOWS) file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES}) + if(MSVC) + # Prevent codegen that would use the VC runtime libraries. + add_definitions(/GS-) + if(NOT ARCH_64) + add_definitions(/arch:SSE) + endif() + endif() + # Check for DirectX if(DIRECTX) - if(NOT CMAKE_COMPILER_IS_MINGW) + if(DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) + set(USE_WINSDK_DIRECTX TRUE) + endif() + if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) if("$ENV{DXSDK_DIR}" STREQUAL "") message_error("DIRECTX requires the \$DXSDK_DIR environment variable to be set") endif() @@ -926,7 +990,7 @@ elseif(WINDOWS) check_include_file(dxgi.h HAVE_DXGI_H) if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H OR HAVE_XAUDIO2_H) set(HAVE_DIRECTX TRUE) - if(NOT CMAKE_COMPILER_IS_MINGW) + if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) # TODO: change $ENV{DXSDL_DIR} to get the path from the include checks link_directories($ENV{DXSDK_DIR}\\lib\\${PROCESSOR_ARCH}) include_directories($ENV{DXSDK_DIR}\\Include) @@ -1044,7 +1108,7 @@ elseif(WINDOWS) list(APPEND EXTRA_LIBS dinput8 dxguid) if(CMAKE_COMPILER_IS_MINGW) list(APPEND EXTRA_LIBS dxerr8) - else() + elseif (NOT USE_WINSDK_DIRECTX) list(APPEND EXTRA_LIBS dxerr) endif() endif() @@ -1087,7 +1151,7 @@ elseif(APPLE) # Requires the darwin file implementation if(SDL_FILE) - file(GLOB EXTRA_SOURCES ${PROJECT_SOURCE_DIR}/src/file/cocoa/*.m) + file(GLOB EXTRA_SOURCES ${SDL2_SOURCE_DIR}/src/file/cocoa/*.m) set(SOURCE_FILES ${EXTRA_SOURCES} ${SOURCE_FILES}) set_source_files_properties(${EXTRA_SOURCES} PROPERTIES LANGUAGE C) set(HAVE_SDL_FILE TRUE) @@ -1403,8 +1467,14 @@ if(SDL_SHARED) SOVERSION ${LT_REVISION} OUTPUT_NAME "SDL2") endif() - set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS}) - target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) + if(MSVC) + # Don't try to link with the default set of libraries. + set_target_properties(SDL2 PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB") + set_target_properties(SDL2 PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB") + set_target_properties(SDL2 PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB") + endif() + set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS}) + target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) endif() if(SDL_STATIC) diff --git a/jni/SDL2-2.0.3/COPYING.txt b/jni/SDL2-2.0.4/COPYING.txt similarity index 91% rename from jni/SDL2-2.0.3/COPYING.txt rename to jni/SDL2-2.0.4/COPYING.txt index 5873af74..04f14eed 100644 --- a/jni/SDL2-2.0.3/COPYING.txt +++ b/jni/SDL2-2.0.4/COPYING.txt @@ -1,6 +1,6 @@ Simple DirectMedia Layer -Copyright (C) 1997-2015 Sam Lantinga +Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/CREDITS.txt b/jni/SDL2-2.0.4/CREDITS.txt similarity index 100% rename from jni/SDL2-2.0.3/CREDITS.txt rename to jni/SDL2-2.0.4/CREDITS.txt diff --git a/jni/SDL2-2.0.3/INSTALL.txt b/jni/SDL2-2.0.4/INSTALL.txt similarity index 100% rename from jni/SDL2-2.0.3/INSTALL.txt rename to jni/SDL2-2.0.4/INSTALL.txt diff --git a/jni/SDL2-2.0.3/Makefile.in b/jni/SDL2-2.0.4/Makefile.in similarity index 100% rename from jni/SDL2-2.0.3/Makefile.in rename to jni/SDL2-2.0.4/Makefile.in diff --git a/jni/SDL2-2.0.3/Makefile.minimal b/jni/SDL2-2.0.4/Makefile.minimal similarity index 100% rename from jni/SDL2-2.0.3/Makefile.minimal rename to jni/SDL2-2.0.4/Makefile.minimal diff --git a/jni/SDL2-2.0.3/Makefile.pandora b/jni/SDL2-2.0.4/Makefile.pandora similarity index 100% rename from jni/SDL2-2.0.3/Makefile.pandora rename to jni/SDL2-2.0.4/Makefile.pandora diff --git a/jni/SDL2-2.0.3/Makefile.psp b/jni/SDL2-2.0.4/Makefile.psp similarity index 100% rename from jni/SDL2-2.0.3/Makefile.psp rename to jni/SDL2-2.0.4/Makefile.psp diff --git a/jni/SDL2-2.0.3/Makefile.wiz b/jni/SDL2-2.0.4/Makefile.wiz similarity index 95% rename from jni/SDL2-2.0.3/Makefile.wiz rename to jni/SDL2-2.0.4/Makefile.wiz index 82619f07..bb770578 100644 --- a/jni/SDL2-2.0.3/Makefile.wiz +++ b/jni/SDL2-2.0.4/Makefile.wiz @@ -12,13 +12,13 @@ CFLAGS = -Wall -fPIC -I./include -I$(WIZSDK)/include -DWIZ_GLES_LITE TARGET_STATIC = libSDL13.a TARGET_SHARED = libSDL13.so -SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \ +SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \ ./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \ ./src/joystick/*.c ./src/haptic/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \ ./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c \ ./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \ ./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \ - ./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \ + ./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \ ./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o diff --git a/jni/SDL2-2.0.3/README-SDL.txt b/jni/SDL2-2.0.4/README-SDL.txt similarity index 100% rename from jni/SDL2-2.0.3/README-SDL.txt rename to jni/SDL2-2.0.4/README-SDL.txt diff --git a/jni/SDL2-2.0.3/README.txt b/jni/SDL2-2.0.4/README.txt similarity index 100% rename from jni/SDL2-2.0.3/README.txt rename to jni/SDL2-2.0.4/README.txt diff --git a/jni/SDL2-2.0.3/SDL.tag b/jni/SDL2-2.0.4/SDL.tag similarity index 100% rename from jni/SDL2-2.0.3/SDL.tag rename to jni/SDL2-2.0.4/SDL.tag diff --git a/jni/SDL2-2.0.3/SDL2.spec.in b/jni/SDL2-2.0.4/SDL2.spec.in similarity index 100% rename from jni/SDL2-2.0.3/SDL2.spec.in rename to jni/SDL2-2.0.4/SDL2.spec.in diff --git a/jni/SDL2-2.0.3/TODO.txt b/jni/SDL2-2.0.4/TODO.txt similarity index 100% rename from jni/SDL2-2.0.3/TODO.txt rename to jni/SDL2-2.0.4/TODO.txt diff --git a/jni/SDL2-2.0.3/VisualC.html b/jni/SDL2-2.0.4/VisualC.html similarity index 100% rename from jni/SDL2-2.0.3/VisualC.html rename to jni/SDL2-2.0.4/VisualC.html diff --git a/jni/SDL2-2.0.3/WhatsNew.txt b/jni/SDL2-2.0.4/WhatsNew.txt similarity index 97% rename from jni/SDL2-2.0.3/WhatsNew.txt rename to jni/SDL2-2.0.4/WhatsNew.txt index b37591d8..698ebf7d 100644 --- a/jni/SDL2-2.0.3/WhatsNew.txt +++ b/jni/SDL2-2.0.4/WhatsNew.txt @@ -71,13 +71,13 @@ Linux: iOS: * Added support for iOS 8 +* The SDL_WINDOW_ALLOW_HIGHDPI window flag now enables high-dpi support, and SDL_GL_GetDrawableSize() or SDL_GetRendererOutputSize() gets the window resolution in pixels +* SDL_GetWindowSize() and display mode sizes are in the "DPI-independent points" / "screen coordinates" coordinate space rather than pixels (matches OS X behavior) +* Added native resolution support for the iPhone 6 Plus * Added support for MFi game controllers * Added support for the hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK * Added sRGB OpenGL ES context support on iOS 7+ -* Added native resolution support for the iPhone 6 Plus * Added support for SDL_DisableScreenSaver(), SDL_EnableScreenSaver() and the hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER -* The SDL_WINDOW_ALLOW_HIGHDPI window flag now enables high-dpi support, and SDL_GL_GetDrawableSize() or SDL_GetRendererOutputSize() gets the window resolution in pixels -* SDL_GetWindowSize() and display mode sizes are in the "DPI-independent points" coordinate space rather than pixels (matches OS X behavior) * SDL_SysWMinfo now contains the OpenGL ES framebuffer and color renderbuffer objects used by the window's active GLES view * Fixed various rotation and orientation issues * Fixed memory leaks diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Default.png b/jni/SDL2-2.0.4/Xcode-iOS/Demos/Default.png similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/Default.png rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/Default.png diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Icon.png b/jni/SDL2-2.0.4/Xcode-iOS/Demos/Icon.png similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/Icon.png rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/Icon.png diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/Info.plist b/jni/SDL2-2.0.4/Xcode-iOS/Demos/Info.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/Info.plist rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/Info.plist diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/README b/jni/SDL2-2.0.4/Xcode-iOS/Demos/README similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/README rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/README diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/bitmapfont/kromasky_16x16.bmp diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/bitmapfont/license.txt b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/bitmapfont/license.txt similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/bitmapfont/license.txt rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/bitmapfont/license.txt diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_brush_snare.wav diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_china.wav b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_china.wav similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_china.wav rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_china.wav diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_kick_big_amb.wav diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/drums/ds_loose_skin_mute.wav diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/icon.bmp b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/icon.bmp similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/icon.bmp rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/icon.bmp diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/ship.bmp b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/ship.bmp similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/ship.bmp rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/ship.bmp diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/space.bmp b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/space.bmp similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/space.bmp rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/space.bmp diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/data/stroke.bmp b/jni/SDL2-2.0.4/Xcode-iOS/Demos/data/stroke.bmp similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/data/stroke.bmp rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/data/stroke.bmp diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/accelerometer.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/accelerometer.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/accelerometer.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/accelerometer.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/common.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/common.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/common.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/common.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/common.h b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/common.h similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/common.h rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/common.h diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/fireworks.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/fireworks.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/fireworks.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/fireworks.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/happy.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/happy.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/happy.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/happy.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/keyboard.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/keyboard.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/keyboard.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/keyboard.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/mixer.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/mixer.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/mixer.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/mixer.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/rectangles.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/rectangles.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/rectangles.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/rectangles.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Demos/src/touch.c b/jni/SDL2-2.0.4/Xcode-iOS/Demos/src/touch.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Demos/src/touch.c rename to jni/SDL2-2.0.4/Xcode-iOS/Demos/src/touch.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode-iOS/SDLtest/SDL2test.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Default.png b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Default.png similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Default.png rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Default.png diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Icon.png b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Icon.png similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Icon.png rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Icon.png diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Info.plist b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Info.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/Info.plist rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/Info.plist diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateIcon.icns diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/TemplateInfo.plist diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/___PROJECTNAME___.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/main.c b/jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/main.c similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Template/SDL iOS Application/main.c rename to jni/SDL2-2.0.4/Xcode-iOS/Template/SDL iOS Application/main.c diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Test/Info.plist b/jni/SDL2-2.0.4/Xcode-iOS/Test/Info.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Test/Info.plist rename to jni/SDL2-2.0.4/Xcode-iOS/Test/Info.plist diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Test/README b/jni/SDL2-2.0.4/Xcode-iOS/Test/README similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Test/README rename to jni/SDL2-2.0.4/Xcode-iOS/Test/README diff --git a/jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist b/jni/SDL2-2.0.4/Xcode/SDL/Info-Framework.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/Info-Framework.plist rename to jni/SDL2-2.0.4/Xcode/SDL/Info-Framework.plist diff --git a/jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode/SDL/SDL.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/SDL.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode/SDL/SDL.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/SDL.info b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/SDL.info similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/SDL.info rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/SDL.info diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/codesign-frameworks.sh similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/codesign-frameworks.sh rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/codesign-frameworks.sh diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/License.txt b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/License.txt similarity index 93% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/License.txt rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/License.txt index e6a9ef84..3c7724df 100644 --- a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/License.txt +++ b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/License.txt @@ -1,6 +1,6 @@ Simple DirectMedia Layer -Copyright (C) 1997-2015 Sam Lantinga +Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/ReadMe.txt b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/ReadMe.txt similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/ReadMe.txt rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/ReadMe.txt diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/SDL_DS_Store b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/SDL_DS_Store similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/resources/SDL_DS_Store rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/resources/SDL_DS_Store diff --git a/jni/SDL2-2.0.3/Xcode/SDL/pkg-support/sdl_logo.pdf b/jni/SDL2-2.0.4/Xcode/SDL/pkg-support/sdl_logo.pdf similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDL/pkg-support/sdl_logo.pdf rename to jni/SDL2-2.0.4/Xcode/SDL/pkg-support/sdl_logo.pdf diff --git a/jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/Xcode/SDLTest/TestDropFile-Info.plist b/jni/SDL2-2.0.4/Xcode/SDLTest/TestDropFile-Info.plist similarity index 100% rename from jni/SDL2-2.0.3/Xcode/SDLTest/TestDropFile-Info.plist rename to jni/SDL2-2.0.4/Xcode/SDLTest/TestDropFile-Info.plist diff --git a/jni/SDL2-2.0.3/Xcode/XcodeDocSet/Doxyfile b/jni/SDL2-2.0.4/Xcode/XcodeDocSet/Doxyfile similarity index 100% rename from jni/SDL2-2.0.3/Xcode/XcodeDocSet/Doxyfile rename to jni/SDL2-2.0.4/Xcode/XcodeDocSet/Doxyfile diff --git a/jni/SDL2-2.0.3/acinclude/ac_check_define.m4 b/jni/SDL2-2.0.4/acinclude/ac_check_define.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ac_check_define.m4 rename to jni/SDL2-2.0.4/acinclude/ac_check_define.m4 diff --git a/jni/SDL2-2.0.3/acinclude/alsa.m4 b/jni/SDL2-2.0.4/acinclude/alsa.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/alsa.m4 rename to jni/SDL2-2.0.4/acinclude/alsa.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ax_check_compiler_flags.m4 b/jni/SDL2-2.0.4/acinclude/ax_check_compiler_flags.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ax_check_compiler_flags.m4 rename to jni/SDL2-2.0.4/acinclude/ax_check_compiler_flags.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ax_gcc_archflag.m4 b/jni/SDL2-2.0.4/acinclude/ax_gcc_archflag.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ax_gcc_archflag.m4 rename to jni/SDL2-2.0.4/acinclude/ax_gcc_archflag.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ax_gcc_x86_cpuid.m4.htm b/jni/SDL2-2.0.4/acinclude/ax_gcc_x86_cpuid.m4.htm similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ax_gcc_x86_cpuid.m4.htm rename to jni/SDL2-2.0.4/acinclude/ax_gcc_x86_cpuid.m4.htm diff --git a/jni/SDL2-2.0.3/acinclude/esd.m4 b/jni/SDL2-2.0.4/acinclude/esd.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/esd.m4 rename to jni/SDL2-2.0.4/acinclude/esd.m4 diff --git a/jni/SDL2-2.0.3/acinclude/libtool.m4 b/jni/SDL2-2.0.4/acinclude/libtool.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/libtool.m4 rename to jni/SDL2-2.0.4/acinclude/libtool.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ltoptions.m4 b/jni/SDL2-2.0.4/acinclude/ltoptions.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ltoptions.m4 rename to jni/SDL2-2.0.4/acinclude/ltoptions.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ltsugar.m4 b/jni/SDL2-2.0.4/acinclude/ltsugar.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ltsugar.m4 rename to jni/SDL2-2.0.4/acinclude/ltsugar.m4 diff --git a/jni/SDL2-2.0.3/acinclude/ltversion.m4 b/jni/SDL2-2.0.4/acinclude/ltversion.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/ltversion.m4 rename to jni/SDL2-2.0.4/acinclude/ltversion.m4 diff --git a/jni/SDL2-2.0.3/acinclude/lt~obsolete.m4 b/jni/SDL2-2.0.4/acinclude/lt~obsolete.m4 similarity index 100% rename from jni/SDL2-2.0.3/acinclude/lt~obsolete.m4 rename to jni/SDL2-2.0.4/acinclude/lt~obsolete.m4 diff --git a/jni/SDL2-2.0.3/android-project/AndroidManifest.xml b/jni/SDL2-2.0.4/android-project/AndroidManifest.xml similarity index 100% rename from jni/SDL2-2.0.3/android-project/AndroidManifest.xml rename to jni/SDL2-2.0.4/android-project/AndroidManifest.xml diff --git a/jni/SDL2-2.0.3/android-project/ant.properties b/jni/SDL2-2.0.4/android-project/ant.properties similarity index 100% rename from jni/SDL2-2.0.3/android-project/ant.properties rename to jni/SDL2-2.0.4/android-project/ant.properties diff --git a/jni/SDL2-2.0.3/android-project/build.properties b/jni/SDL2-2.0.4/android-project/build.properties similarity index 100% rename from jni/SDL2-2.0.3/android-project/build.properties rename to jni/SDL2-2.0.4/android-project/build.properties diff --git a/jni/SDL2-2.0.3/android-project/build.xml b/jni/SDL2-2.0.4/android-project/build.xml similarity index 100% rename from jni/SDL2-2.0.3/android-project/build.xml rename to jni/SDL2-2.0.4/android-project/build.xml diff --git a/jni/SDL2-2.0.3/android-project/default.properties b/jni/SDL2-2.0.4/android-project/default.properties similarity index 100% rename from jni/SDL2-2.0.3/android-project/default.properties rename to jni/SDL2-2.0.4/android-project/default.properties diff --git a/jni/SDL2-2.0.3/android-project/jni/Android.mk b/jni/SDL2-2.0.4/android-project/jni/Android.mk similarity index 100% rename from jni/SDL2-2.0.3/android-project/jni/Android.mk rename to jni/SDL2-2.0.4/android-project/jni/Android.mk diff --git a/jni/SDL2-2.0.3/android-project/jni/Application.mk b/jni/SDL2-2.0.4/android-project/jni/Application.mk similarity index 100% rename from jni/SDL2-2.0.3/android-project/jni/Application.mk rename to jni/SDL2-2.0.4/android-project/jni/Application.mk diff --git a/jni/SDL2-2.0.3/android-project/jni/src/Android.mk b/jni/SDL2-2.0.4/android-project/jni/src/Android.mk similarity index 100% rename from jni/SDL2-2.0.3/android-project/jni/src/Android.mk rename to jni/SDL2-2.0.4/android-project/jni/src/Android.mk diff --git a/jni/SDL2-2.0.3/android-project/jni/src/Android_static.mk b/jni/SDL2-2.0.4/android-project/jni/src/Android_static.mk similarity index 100% rename from jni/SDL2-2.0.3/android-project/jni/src/Android_static.mk rename to jni/SDL2-2.0.4/android-project/jni/src/Android_static.mk diff --git a/jni/SDL2-2.0.3/android-project/proguard-project.txt b/jni/SDL2-2.0.4/android-project/proguard-project.txt similarity index 100% rename from jni/SDL2-2.0.3/android-project/proguard-project.txt rename to jni/SDL2-2.0.4/android-project/proguard-project.txt diff --git a/jni/SDL2-2.0.3/android-project/project.properties b/jni/SDL2-2.0.4/android-project/project.properties similarity index 100% rename from jni/SDL2-2.0.3/android-project/project.properties rename to jni/SDL2-2.0.4/android-project/project.properties diff --git a/jni/SDL2-2.0.3/android-project/res/drawable-hdpi/ic_launcher.png b/jni/SDL2-2.0.4/android-project/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/drawable-hdpi/ic_launcher.png rename to jni/SDL2-2.0.4/android-project/res/drawable-hdpi/ic_launcher.png diff --git a/jni/SDL2-2.0.3/android-project/res/drawable-mdpi/ic_launcher.png b/jni/SDL2-2.0.4/android-project/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/drawable-mdpi/ic_launcher.png rename to jni/SDL2-2.0.4/android-project/res/drawable-mdpi/ic_launcher.png diff --git a/jni/SDL2-2.0.3/android-project/res/drawable-xhdpi/ic_launcher.png b/jni/SDL2-2.0.4/android-project/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/drawable-xhdpi/ic_launcher.png rename to jni/SDL2-2.0.4/android-project/res/drawable-xhdpi/ic_launcher.png diff --git a/jni/SDL2-2.0.3/android-project/res/drawable-xxhdpi/ic_launcher.png b/jni/SDL2-2.0.4/android-project/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/drawable-xxhdpi/ic_launcher.png rename to jni/SDL2-2.0.4/android-project/res/drawable-xxhdpi/ic_launcher.png diff --git a/jni/SDL2-2.0.3/android-project/res/layout/main.xml b/jni/SDL2-2.0.4/android-project/res/layout/main.xml similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/layout/main.xml rename to jni/SDL2-2.0.4/android-project/res/layout/main.xml diff --git a/jni/SDL2-2.0.3/android-project/res/values/strings.xml b/jni/SDL2-2.0.4/android-project/res/values/strings.xml similarity index 100% rename from jni/SDL2-2.0.3/android-project/res/values/strings.xml rename to jni/SDL2-2.0.4/android-project/res/values/strings.xml diff --git a/jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java b/jni/SDL2-2.0.4/android-project/src/org/libsdl/app/SDLActivity.java similarity index 100% rename from jni/SDL2-2.0.3/android-project/src/org/libsdl/app/SDLActivity.java rename to jni/SDL2-2.0.4/android-project/src/org/libsdl/app/SDLActivity.java diff --git a/jni/SDL2-2.0.3/autogen.sh b/jni/SDL2-2.0.4/autogen.sh similarity index 100% rename from jni/SDL2-2.0.3/autogen.sh rename to jni/SDL2-2.0.4/autogen.sh diff --git a/jni/SDL2-2.0.3/build-scripts/androidbuild.sh b/jni/SDL2-2.0.4/build-scripts/androidbuild.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/androidbuild.sh rename to jni/SDL2-2.0.4/build-scripts/androidbuild.sh diff --git a/jni/SDL2-2.0.3/build-scripts/checker-buildbot.sh b/jni/SDL2-2.0.4/build-scripts/checker-buildbot.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/checker-buildbot.sh rename to jni/SDL2-2.0.4/build-scripts/checker-buildbot.sh diff --git a/jni/SDL2-2.0.3/build-scripts/config.guess b/jni/SDL2-2.0.4/build-scripts/config.guess similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/config.guess rename to jni/SDL2-2.0.4/build-scripts/config.guess diff --git a/jni/SDL2-2.0.3/build-scripts/config.sub b/jni/SDL2-2.0.4/build-scripts/config.sub similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/config.sub rename to jni/SDL2-2.0.4/build-scripts/config.sub diff --git a/jni/SDL2-2.0.3/build-scripts/emscripten-buildbot.sh b/jni/SDL2-2.0.4/build-scripts/emscripten-buildbot.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/emscripten-buildbot.sh rename to jni/SDL2-2.0.4/build-scripts/emscripten-buildbot.sh diff --git a/jni/SDL2-2.0.3/build-scripts/g++-fat.sh b/jni/SDL2-2.0.4/build-scripts/g++-fat.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/g++-fat.sh rename to jni/SDL2-2.0.4/build-scripts/g++-fat.sh diff --git a/jni/SDL2-2.0.3/build-scripts/gcc-fat.sh b/jni/SDL2-2.0.4/build-scripts/gcc-fat.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/gcc-fat.sh rename to jni/SDL2-2.0.4/build-scripts/gcc-fat.sh diff --git a/jni/SDL2-2.0.3/build-scripts/install-sh b/jni/SDL2-2.0.4/build-scripts/install-sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/install-sh rename to jni/SDL2-2.0.4/build-scripts/install-sh diff --git a/jni/SDL2-2.0.3/build-scripts/iosbuild.sh b/jni/SDL2-2.0.4/build-scripts/iosbuild.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/iosbuild.sh rename to jni/SDL2-2.0.4/build-scripts/iosbuild.sh diff --git a/jni/SDL2-2.0.3/build-scripts/ltmain.sh b/jni/SDL2-2.0.4/build-scripts/ltmain.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/ltmain.sh rename to jni/SDL2-2.0.4/build-scripts/ltmain.sh diff --git a/jni/SDL2-2.0.3/build-scripts/mkinstalldirs b/jni/SDL2-2.0.4/build-scripts/mkinstalldirs similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/mkinstalldirs rename to jni/SDL2-2.0.4/build-scripts/mkinstalldirs diff --git a/jni/SDL2-2.0.3/build-scripts/nacl-buildbot.sh b/jni/SDL2-2.0.4/build-scripts/nacl-buildbot.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/nacl-buildbot.sh rename to jni/SDL2-2.0.4/build-scripts/nacl-buildbot.sh diff --git a/jni/SDL2-2.0.3/build-scripts/naclbuild.sh b/jni/SDL2-2.0.4/build-scripts/naclbuild.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/naclbuild.sh rename to jni/SDL2-2.0.4/build-scripts/naclbuild.sh diff --git a/jni/SDL2-2.0.3/build-scripts/raspberrypi-buildbot.sh b/jni/SDL2-2.0.4/build-scripts/raspberrypi-buildbot.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/raspberrypi-buildbot.sh rename to jni/SDL2-2.0.4/build-scripts/raspberrypi-buildbot.sh diff --git a/jni/SDL2-2.0.3/build-scripts/showrev.sh b/jni/SDL2-2.0.4/build-scripts/showrev.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/showrev.sh rename to jni/SDL2-2.0.4/build-scripts/showrev.sh diff --git a/jni/SDL2-2.0.3/build-scripts/strip_fPIC.sh b/jni/SDL2-2.0.4/build-scripts/strip_fPIC.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/strip_fPIC.sh rename to jni/SDL2-2.0.4/build-scripts/strip_fPIC.sh diff --git a/jni/SDL2-2.0.3/build-scripts/update-copyright.sh b/jni/SDL2-2.0.4/build-scripts/update-copyright.sh similarity index 66% rename from jni/SDL2-2.0.3/build-scripts/update-copyright.sh rename to jni/SDL2-2.0.4/build-scripts/update-copyright.sh index fdfb5ca9..34864bc9 100755 --- a/jni/SDL2-2.0.3/build-scripts/update-copyright.sh +++ b/jni/SDL2-2.0.4/build-scripts/update-copyright.sh @@ -4,6 +4,6 @@ find . -type f -exec grep -Il "Copyright" {} \; \ | grep -v \.hg \ | while read i; \ do \ - sed -ie "s/\(.*Copyright.*\)[0-9]\{4\}\( *Sam Lantinga\)/\1`date +%Y`\2/" "$i"; \ + LC_ALL=C sed -ie "s/\(.*Copyright.*\)[0-9]\{4\}\( *Sam Lantinga\)/\1`date +%Y`\2/" "$i"; \ rm "${i}e"; \ done diff --git a/jni/SDL2-2.0.3/build-scripts/updaterev.sh b/jni/SDL2-2.0.4/build-scripts/updaterev.sh similarity index 100% rename from jni/SDL2-2.0.3/build-scripts/updaterev.sh rename to jni/SDL2-2.0.4/build-scripts/updaterev.sh diff --git a/jni/SDL2-2.0.3/build-scripts/windows-buildbot-zipper.bat b/jni/SDL2-2.0.4/build-scripts/windows-buildbot-zipper.bat similarity index 95% rename from jni/SDL2-2.0.3/build-scripts/windows-buildbot-zipper.bat rename to jni/SDL2-2.0.4/build-scripts/windows-buildbot-zipper.bat index 7548cdd8..5a1e40a2 100644 --- a/jni/SDL2-2.0.3/build-scripts/windows-buildbot-zipper.bat +++ b/jni/SDL2-2.0.4/build-scripts/windows-buildbot-zipper.bat @@ -1,31 +1,31 @@ -@echo off -rem just a helper batch file for collecting up files and zipping them. -rem usage: windows-buildbot-zipper.bat -rem must be run from root of SDL source tree. - -IF EXIST VisualC\Win32\Release GOTO okaydir -echo Please run from root of source tree after doing a Release build. -GOTO done - -:okaydir -erase /q /f /s zipper -IF EXIST zipper GOTO zippermade -mkdir zipper -:zippermade -cd zipper -mkdir SDL -cd SDL -mkdir include -mkdir lib -mkdir lib\win32 -copy ..\..\include\*.h include\ -copy ..\..\VisualC\Win32\Release\SDL2.dll lib\win32\ -copy ..\..\VisualC\Win32\Release\SDL2.lib lib\win32\ -copy ..\..\VisualC\Win32\Release\SDL2main.lib lib\win32\ -cd .. -zip -9r ..\%1 SDL -cd .. -erase /q /f /s zipper - -:done - +@echo off +rem just a helper batch file for collecting up files and zipping them. +rem usage: windows-buildbot-zipper.bat +rem must be run from root of SDL source tree. + +IF EXIST VisualC\Win32\Release GOTO okaydir +echo Please run from root of source tree after doing a Release build. +GOTO done + +:okaydir +erase /q /f /s zipper +IF EXIST zipper GOTO zippermade +mkdir zipper +:zippermade +cd zipper +mkdir SDL +cd SDL +mkdir include +mkdir lib +mkdir lib\win32 +copy ..\..\include\*.h include\ +copy ..\..\VisualC\Win32\Release\SDL2.dll lib\win32\ +copy ..\..\VisualC\Win32\Release\SDL2.lib lib\win32\ +copy ..\..\VisualC\Win32\Release\SDL2main.lib lib\win32\ +cd .. +zip -9r ..\%1 SDL +cd .. +erase /q /f /s zipper + +:done + diff --git a/jni/SDL2-2.0.3/build-scripts/winrtbuild.bat b/jni/SDL2-2.0.4/build-scripts/winrtbuild.bat similarity index 97% rename from jni/SDL2-2.0.3/build-scripts/winrtbuild.bat rename to jni/SDL2-2.0.4/build-scripts/winrtbuild.bat index fb8df481..fb315988 100644 --- a/jni/SDL2-2.0.3/build-scripts/winrtbuild.bat +++ b/jni/SDL2-2.0.4/build-scripts/winrtbuild.bat @@ -1,8 +1,8 @@ -@ECHO OFF -REM -REM winrtbuild.bat: a batch file to help launch the winrtbuild.ps1 -REM Powershell script, either from Windows Explorer, or through Buildbot. -REM -SET ThisScriptsDirectory=%~dp0 -SET PowerShellScriptPath=%ThisScriptsDirectory%winrtbuild.ps1 +@ECHO OFF +REM +REM winrtbuild.bat: a batch file to help launch the winrtbuild.ps1 +REM Powershell script, either from Windows Explorer, or through Buildbot. +REM +SET ThisScriptsDirectory=%~dp0 +SET PowerShellScriptPath=%ThisScriptsDirectory%winrtbuild.ps1 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '%PowerShellScriptPath%'"; \ No newline at end of file diff --git a/jni/SDL2-2.0.3/build-scripts/winrtbuild.ps1 b/jni/SDL2-2.0.4/build-scripts/winrtbuild.ps1 similarity index 72% rename from jni/SDL2-2.0.3/build-scripts/winrtbuild.ps1 rename to jni/SDL2-2.0.4/build-scripts/winrtbuild.ps1 index 0045ee0a..31ac504b 100644 --- a/jni/SDL2-2.0.3/build-scripts/winrtbuild.ps1 +++ b/jni/SDL2-2.0.4/build-scripts/winrtbuild.ps1 @@ -1,240 +1,294 @@ -# -# winrtbuild.ps1 -- A Powershell script to build all SDL/WinRT variants, -# across all WinRT platforms, in all of their supported, CPU architectures. -# -# Initial version written by David Ludwig -# -# This script can be launched from Windows Explorer by double-clicking -# on winrtbuild.bat -# -# Output will be placed in the following subdirectories of the SDL source -# tree: -# * VisualC-WinRT\lib\ -- final .dll, .lib, and .pdb files -# * VisualC-WinRT\obj\ -- intermediate build files -# -# Recommended Dependencies: -# * Windows 8.1 or higher -# * Powershell 4.0 or higher (included as part of Windows 8.1) -# * Visual C++ 2012, for building Windows 8.0 and Windows Phone 8.0 binaries. -# * Visual C++ 2013, for building Windows 8.1 and Windows Phone 8.1 binaries -# * SDKs for Windows 8.0, Windows 8.1, Windows Phone 8.0, and -# Windows Phone 8.1, as needed -# -# Commom parameters/variables may include, but aren't strictly limited to: -# * PlatformToolset: the name of one of Visual Studio's build platforms. -# Different PlatformToolsets output different binaries. One -# PlatformToolset exists for each WinRT platform. Possible values -# may include: -# - "v110": Visual Studio 2012 build tools, plus the Windows 8.0 SDK -# - "v110_wp80": Visual Studio 2012 build tools, plus the Windows Phone 8.0 SDK -# - "v120": Visual Studio 2013 build tools, plus the Windows 8.1 SDK -# - "v120_wp81": Visual Studio 2013 build tools, plus the Windows Phone 8.1 SDK -# * VSProjectPath: the full path to a Visual Studio or Visual C++ project file -# * VSProjectName: the internal name of a Visual Studio or Visual C++ project -# file. Some of Visual Studio's own build tools use this name when -# calculating paths for build-output. -# * Platform: a Visual Studio platform name, which often maps to a CPU -# CPU architecture. Possible values may include: "Win32" (for 32-bit x86), -# "ARM", or "x64" (for 64-bit x86). -# - - -# Gets the .bat file that sets up an MSBuild environment, given one of -# Visual Studio's, "PlatformToolset"s. -function Get-MSBuild-Env-Launcher -{ - param( - [Parameter(Mandatory=$true,Position=1)][string]$PlatformToolset - ) - - if ($PlatformToolset -eq "v110") { # Windows 8.0 (not Windows Phone), via VS 2012 - return "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" - } - if ($PlatformToolset -eq "v110_wp80") { # Windows Phone 8.0, via VS 2012 - return "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\WPSDK\WP80\vcvarsphoneall.bat" - } - if ($PlatformToolset -eq "v120") { # Windows 8.1 (not Windows Phone), via VS 2013 - return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" - } - if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 - return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" - } - if ($PlatformToolset -eq "v140") { # Windows 10, via VS 2015 - return "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" - } - return "" -} - -# Gets a string that identifies the build-variant of SDL/WinRT that is specific -# to a particular Visual Studio PlatformToolset. -function Get-SDL-WinRT-Variant-Name -{ - param( - [Parameter(Mandatory=$true,Position=1)][string]$PlatformToolset, - - # If true, append a string to this function's output, identifying the - # build-variant's minimum-supported version of Visual Studio. - [switch]$IncludeVSSuffix = $false - ) - - if ($PlatformToolset -eq "v110") { # Windows 8.0 (not Windows Phone), via VS 2012 project files - if ($IncludeVSSuffix) { - return "WinRT80_VS2012" - } else { - return "WinRT80" - } - } - if ($PlatformToolset -eq "v110_wp80") { # Windows Phone 8.0, via VS 2012 project files - if ($IncludeVSSuffix) { - return "WinPhone80_VS2012" - } else { - return "WinPhone80" - } - } - if ($PlatformToolset -eq "v120") { # Windows 8.1 (not Windows Phone), via VS 2013 project files - if ($IncludeVSSuffix) { - return "WinRT81_VS2013" - } else { - return "WinRT81" - } - } - if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 project files - if ($IncludeVSSuffix) { - return "WinPhone81_VS2013" - } else { - return "WinPhone81" - } - } - if ($PlatformToolset -eq "v140") { # Windows 10, via VS 2015 project files - if ($IncludeVSSuffix) { - return "UWP_VS2015" - } else { - return "UWP" - } - } - return "" -} - -# Returns the internal name of a Visual Studio Project. -# -# The internal name of a VS Project is encoded inside the project file -# itself, inside a set of XML tags. -function Get-VS-ProjectName -{ - param( - [Parameter(Mandatory=$true,Position=1)]$VSProjectPath - ) - - # For now, just do a regex for the project name: - $matches = (Get-Content $VSProjectPath | Select-String -Pattern ".*([^<]+)<.*").Matches - foreach ($match in $matches) { - if ($match.Groups.Count -ge 1) { - return $match.Groups[1].Value - } - } - return $null -} - -# Build a specific variant of SDL/WinRT -function Build-SDL-WinRT-Variant -{ - # - # Read in arguments: - # - param ( - # name of an SDL project file, minus extensions and - # platform-identifying suffixes - [Parameter(Mandatory=$true,Position=1)][string]$SDLProjectName, - - [Parameter(Mandatory=$true,Position=2)][string]$PlatformToolset, - - [Parameter(Mandatory=$true,Position=3)][string]$Platform - ) - - # - # Derive other properties from read-in arguments: - # - - # The .bat file to setup a platform-appropriate MSBuild environment: - $BatchFileForMSBuildEnv = Get-MSBuild-Env-Launcher $PlatformToolset - - # The full path to the VS Project that'll be built: - $VSProjectPath = "$PSScriptRoot\..\VisualC-WinRT\$(Get-SDL-WinRT-Variant-Name $PlatformToolset -IncludeVSSuffix)\$SDLProjectName-$(Get-SDL-WinRT-Variant-Name $PlatformToolset).vcxproj" - - # The internal name of the VS Project, used in some post-build steps: - $VSProjectName = Get-VS-ProjectName $VSProjectPath - - # Where to place output binaries (.dll, .lib, and .pdb files): - $OutDir = "$PSScriptRoot\..\VisualC-WinRT\lib\$PlatformToolset\$Platform" - - # Where to place intermediate build files: - $IntermediateDir = "$PSScriptRoot\..\VisualC-WinRT\obj\$SDLProjectName-$(Get-SDL-WinRT-Variant-Name $PlatformToolset)\$Platform" - - # - # Build the VS Project: - # - cmd.exe /c " ""$BatchFileForMSBuildEnv"" x86 & msbuild ""$VSProjectPath"" /p:Configuration=Release /p:Platform=$Platform /p:OutDir=""$OutDir\\"" /p:IntDir=""$IntermediateDir\\""" | Out-Host - $BuildResult = $? - - # - # Move .dll files into place. This fixes a problem whereby MSBuild may - # put output files into a sub-directory of $OutDir, rather than $OutDir - # itself. - # - if (Test-Path "$OutDir\$VSProjectName\") { - Move-Item -Force "$OutDir\$VSProjectName\*" "$OutDir" - } - - # - # Clean up unneeded files in $OutDir: - # - if (Test-Path "$OutDir\$VSProjectName\") { - Remove-Item -Recurse "$OutDir\$VSProjectName" - } - Remove-Item "$OutDir\*.exp" - Remove-Item "$OutDir\*.ilk" - Remove-Item "$OutDir\*.pri" - - # - # All done. Indicate success, or failure, to the caller: - # - #echo "RESULT: $BuildResult" | Out-Host - return $BuildResult -} - - -# -# Build each variant, with corresponding .dll, .lib, and .pdb files: -# -$DidAnyFail = $false - -# Build for Windows Phone 8.0, via VC++ 2012: -if ( ! (Build-SDL-WinRT-Variant "SDL" "v110_wp80" "ARM")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v110_wp80" "Win32")) { $DidAnyFail = $true } - -# Build for Windows Phone 8.1, via VC++ 2013: -if ( ! (Build-SDL-WinRT-Variant "SDL" "v120_wp81" "ARM")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v120_wp81" "Win32")) { $DidAnyFail = $true } - -# Build for Windows 8.0 and Windows RT 8.0, via VC++ 2012: -if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "ARM")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "Win32")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "x64")) { $DidAnyFail = $true } - -# Build for Windows 8.1 and Windows RT 8.1, via VC++ 2013: -if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "ARM")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "Win32")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "x64")) { $DidAnyFail = $true } - -# Build for Windows 10, via VC++ 2015 -if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "ARM")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "Win32")) { $DidAnyFail = $true } -if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "x64")) { $DidAnyFail = $true } - -# Let the script's caller know whether or not any errors occurred. -# Exit codes compatible with Buildbot are used (1 for error, 0 for success). -if ($DidAnyFail -eq $true) { - exit 1 -} else { - exit 0 -} +# +# winrtbuild.ps1 -- A Powershell script to build all SDL/WinRT variants, +# across all WinRT platforms, in all of their supported, CPU architectures. +# +# Initial version written by David Ludwig +# +# This script can be launched from Windows Explorer by double-clicking +# on winrtbuild.bat +# +# Output will be placed in the following subdirectories of the SDL source +# tree: +# * VisualC-WinRT\lib\ -- final .dll, .lib, and .pdb files +# * VisualC-WinRT\obj\ -- intermediate build files +# +# Recommended Dependencies: +# * Windows 8.1 or higher +# * Powershell 4.0 or higher (included as part of Windows 8.1) +# * Visual C++ 2012, for building Windows 8.0 and Windows Phone 8.0 binaries. +# * Visual C++ 2013, for building Windows 8.1 and Windows Phone 8.1 binaries +# * SDKs for Windows 8.0, Windows 8.1, Windows Phone 8.0, and +# Windows Phone 8.1, as needed +# +# Commom parameters/variables may include, but aren't strictly limited to: +# * PlatformToolset: the name of one of Visual Studio's build platforms. +# Different PlatformToolsets output different binaries. One +# PlatformToolset exists for each WinRT platform. Possible values +# may include: +# - "v110": Visual Studio 2012 build tools, plus the Windows 8.0 SDK +# - "v110_wp80": Visual Studio 2012 build tools, plus the Windows Phone 8.0 SDK +# - "v120": Visual Studio 2013 build tools, plus the Windows 8.1 SDK +# - "v120_wp81": Visual Studio 2013 build tools, plus the Windows Phone 8.1 SDK +# * VSProjectPath: the full path to a Visual Studio or Visual C++ project file +# * VSProjectName: the internal name of a Visual Studio or Visual C++ project +# file. Some of Visual Studio's own build tools use this name when +# calculating paths for build-output. +# * Platform: a Visual Studio platform name, which often maps to a CPU +# CPU architecture. Possible values may include: "Win32" (for 32-bit x86), +# "ARM", or "x64" (for 64-bit x86). +# + +# Base version of SDL, used for packaging purposes +$SDLVersion = "2.0.4" + +# Gets the .bat file that sets up an MSBuild environment, given one of +# Visual Studio's, "PlatformToolset"s. +function Get-MSBuild-Env-Launcher +{ + param( + [Parameter(Mandatory=$true,Position=1)][string]$PlatformToolset + ) + + if ($PlatformToolset -eq "v110") { # Windows 8.0 (not Windows Phone), via VS 2012 + return "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" + } + if ($PlatformToolset -eq "v110_wp80") { # Windows Phone 8.0, via VS 2012 + return "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\WPSDK\WP80\vcvarsphoneall.bat" + } + if ($PlatformToolset -eq "v120") { # Windows 8.1 (not Windows Phone), via VS 2013 + return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" + } + if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 + return "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" + } + if ($PlatformToolset -eq "v140") { # Windows 10, via VS 2015 + return "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" + } + return "" +} + +# Gets a string that identifies the build-variant of SDL/WinRT that is specific +# to a particular Visual Studio PlatformToolset. +function Get-SDL-WinRT-Variant-Name +{ + param( + [Parameter(Mandatory=$true,Position=1)][string]$PlatformToolset, + + # If true, append a string to this function's output, identifying the + # build-variant's minimum-supported version of Visual Studio. + [switch]$IncludeVSSuffix = $false + ) + + if ($PlatformToolset -eq "v110") { # Windows 8.0 (not Windows Phone), via VS 2012 project files + if ($IncludeVSSuffix) { + return "WinRT80_VS2012" + } else { + return "WinRT80" + } + } + if ($PlatformToolset -eq "v110_wp80") { # Windows Phone 8.0, via VS 2012 project files + if ($IncludeVSSuffix) { + return "WinPhone80_VS2012" + } else { + return "WinPhone80" + } + } + if ($PlatformToolset -eq "v120") { # Windows 8.1 (not Windows Phone), via VS 2013 project files + if ($IncludeVSSuffix) { + return "WinRT81_VS2013" + } else { + return "WinRT81" + } + } + if ($PlatformToolset -eq "v120_wp81") { # Windows Phone 8.1, via VS 2013 project files + if ($IncludeVSSuffix) { + return "WinPhone81_VS2013" + } else { + return "WinPhone81" + } + } + if ($PlatformToolset -eq "v140") { # Windows 10, via VS 2015 project files + if ($IncludeVSSuffix) { + return "UWP_VS2015" + } else { + return "UWP" + } + } + return "" +} + +# Returns the internal name of a Visual Studio Project. +# +# The internal name of a VS Project is encoded inside the project file +# itself, inside a set of XML tags. +function Get-VS-ProjectName +{ + param( + [Parameter(Mandatory=$true,Position=1)]$VSProjectPath + ) + + # For now, just do a regex for the project name: + $matches = (Get-Content $VSProjectPath | Select-String -Pattern ".*([^<]+)<.*").Matches + foreach ($match in $matches) { + if ($match.Groups.Count -ge 1) { + return $match.Groups[1].Value + } + } + return $null +} + +# Build a specific variant of SDL/WinRT +function Build-SDL-WinRT-Variant +{ + # + # Read in arguments: + # + param ( + # name of an SDL project file, minus extensions and + # platform-identifying suffixes + [Parameter(Mandatory=$true,Position=1)][string]$SDLProjectName, + + [Parameter(Mandatory=$true,Position=2)][string]$PlatformToolset, + + [Parameter(Mandatory=$true,Position=3)][string]$Platform + ) + + # + # Derive other properties from read-in arguments: + # + + # The .bat file to setup a platform-appropriate MSBuild environment: + $BatchFileForMSBuildEnv = Get-MSBuild-Env-Launcher $PlatformToolset + + # The full path to the VS Project that'll be built: + $VSProjectPath = "$PSScriptRoot\..\VisualC-WinRT\$(Get-SDL-WinRT-Variant-Name $PlatformToolset -IncludeVSSuffix)\$SDLProjectName-$(Get-SDL-WinRT-Variant-Name $PlatformToolset).vcxproj" + + # The internal name of the VS Project, used in some post-build steps: + $VSProjectName = Get-VS-ProjectName $VSProjectPath + + # Where to place output binaries (.dll, .lib, and .pdb files): + $OutDir = "$PSScriptRoot\..\VisualC-WinRT\lib\$(Get-SDL-WinRT-Variant-Name $PlatformToolset)\$Platform" + + # Where to place intermediate build files: + $IntermediateDir = "$PSScriptRoot\..\VisualC-WinRT\obj\$SDLProjectName-$(Get-SDL-WinRT-Variant-Name $PlatformToolset)\$Platform" + + # + # Build the VS Project: + # + cmd.exe /c " ""$BatchFileForMSBuildEnv"" x86 & msbuild ""$VSProjectPath"" /p:Configuration=Release /p:Platform=$Platform /p:OutDir=""$OutDir\\"" /p:IntDir=""$IntermediateDir\\""" | Out-Host + $BuildResult = $? + + # + # Move .dll files into place. This fixes a problem whereby MSBuild may + # put output files into a sub-directory of $OutDir, rather than $OutDir + # itself. + # + if (Test-Path "$OutDir\$VSProjectName\") { + Move-Item -Force "$OutDir\$VSProjectName\*" "$OutDir" + } + + # + # Clean up unneeded files in $OutDir: + # + if (Test-Path "$OutDir\$VSProjectName\") { + Remove-Item -Recurse "$OutDir\$VSProjectName" + } + Remove-Item "$OutDir\*.exp" + Remove-Item "$OutDir\*.ilk" + Remove-Item "$OutDir\*.pri" + + # + # All done. Indicate success, or failure, to the caller: + # + #echo "RESULT: $BuildResult" | Out-Host + return $BuildResult +} + + +# +# Build each variant, with corresponding .dll, .lib, and .pdb files: +# +$DidAnyDLLBuildFail = $false +$DidAnyNugetBuildFail = $false + +# Build for Windows Phone 8.0, via VC++ 2012: +if ( ! (Build-SDL-WinRT-Variant "SDL" "v110_wp80" "ARM")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v110_wp80" "Win32")) { $DidAnyDLLBuildFail = $true } + +# Build for Windows Phone 8.1, via VC++ 2013: +if ( ! (Build-SDL-WinRT-Variant "SDL" "v120_wp81" "ARM")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v120_wp81" "Win32")) { $DidAnyDLLBuildFail = $true } + +# Build for Windows 8.0 and Windows RT 8.0, via VC++ 2012: +if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "ARM")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "Win32")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v110" "x64")) { $DidAnyDLLBuildFail = $true } + +# Build for Windows 8.1 and Windows RT 8.1, via VC++ 2013: +if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "ARM")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "Win32")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v120" "x64")) { $DidAnyDLLBuildFail = $true } + +# Build for Windows 10, via VC++ 2015 +if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "ARM")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "Win32")) { $DidAnyDLLBuildFail = $true } +if ( ! (Build-SDL-WinRT-Variant "SDL" "v140" "x64")) { $DidAnyDLLBuildFail = $true } + +# Build NuGet packages, if possible +if ($DidAnyDLLBuildFail -eq $true) { + Write-Warning -Message "Unable to build all variants. NuGet packages will not be built." + $DidAnyNugetBuildFail = $true +} else { + $NugetPath = (Get-Command -CommandType Application nuget.exe | %{$_.Path}) 2> $null + if ("$NugetPath" -eq "") { + Write-Warning -Message "Unable to find nuget.exe. NuGet packages will not be built." + $DidAnyNugetBuildFail = $true + } else { + Write-Host -ForegroundColor Cyan "Building SDL2 NuGet packages..." + Write-Host -ForegroundColor Cyan "... via NuGet install: $NugetPath" + $NugetOutputDir = "$PSScriptRoot\..\VisualC-WinRT\lib\nuget" + Write-Host -ForegroundColor Cyan "... output directory: $NugetOutputDir" + $SDLHGRevision = $($(hg log -l 1 --repository "$PSScriptRoot\.." | select-string "changeset") -Replace "changeset:\W*(\d+).*",'$1') 2>$null + Write-Host -ForegroundColor Cyan "... HG Revision: $SDLHGRevision" + + # Base options to nuget.exe + $NugetOptions = @("pack", "PACKAGE_NAME_WILL_GO_HERE", "-Output", "$NugetOutputDir") + + # Try attaching hg revision to NuGet package: + $NugetOptions += "-Version" + if ("$SDLHGRevision" -eq "") { + Write-Warning -Message "Unable to find the Mercurial revision (maybe hg.exe can't be found?). NuGet packages will not have this attached to their name." + $NugetOptions += "$SDLVersion-Unofficial" + } else { + $NugetOptions += "$SDLVersion.$SDLHGRevision-Unofficial" + } + + # Create NuGet output dir, if not yet created: + if ($(Test-Path "$NugetOutputDir") -eq $false) { + New-Item "$NugetOutputDir" -type directory + } + + # Package SDL2: + $NugetOptions[1] = "$PSScriptRoot\..\VisualC-WinRT\SDL2-WinRT.nuspec" + &"$NugetPath" $NugetOptions -Symbols + if ( ! $? ) { $DidAnyNugetBuildFail = $true } + + # Package SDL2main: + $NugetOptions[1] = "$PSScriptRoot\..\VisualC-WinRT\SDL2main-WinRT-NonXAML.nuspec" + &"$NugetPath" $NugetOptions + if ( ! $? ) { $DidAnyNugetBuildFail = $true } + } +} + + +# Let the script's caller know whether or not any errors occurred. +# Exit codes compatible with Buildbot are used (1 for error, 0 for success). +if ($DidAnyDLLBuildFail -eq $true) { + Write-Error -Message "Unable to build all known variants of SDL2 for WinRT" + exit 1 +} elseif ($DidAnyNugetBuildFail -eq $true) { + Write-Warning -Message "Unable to build NuGet packages" + exit 0 # Should NuGet package build failure lead to a non-failing result code instead? +} else { + exit 0 +} diff --git a/jni/SDL2-2.0.3/cmake/macros.cmake b/jni/SDL2-2.0.4/cmake/macros.cmake similarity index 100% rename from jni/SDL2-2.0.3/cmake/macros.cmake rename to jni/SDL2-2.0.4/cmake/macros.cmake diff --git a/jni/SDL2-2.0.3/cmake/sdlchecks.cmake b/jni/SDL2-2.0.4/cmake/sdlchecks.cmake similarity index 100% rename from jni/SDL2-2.0.3/cmake/sdlchecks.cmake rename to jni/SDL2-2.0.4/cmake/sdlchecks.cmake diff --git a/jni/SDL2-2.0.3/cmake_uninstall.cmake.in b/jni/SDL2-2.0.4/cmake_uninstall.cmake.in similarity index 100% rename from jni/SDL2-2.0.3/cmake_uninstall.cmake.in rename to jni/SDL2-2.0.4/cmake_uninstall.cmake.in diff --git a/jni/SDL2-2.0.3/configure b/jni/SDL2-2.0.4/configure similarity index 99% rename from jni/SDL2-2.0.3/configure rename to jni/SDL2-2.0.4/configure index 047af8da..a41f0259 100755 --- a/jni/SDL2-2.0.3/configure +++ b/jni/SDL2-2.0.4/configure @@ -22938,6 +22938,21 @@ case "$host" in *-*-bsdi*) ARCH=bsdi ;; *-*-freebsd*) ARCH=freebsd ;; *-*-dragonfly*) ARCH=freebsd ;; + *-raspberry-netbsd*) + # Raspberry Pi + ARCH=netbsd + RPI_CFLAGS="-I/usr/pkg/include -I/usr/pkg/include/interface/vcos/pthreads -I/usr/pkg/include/interface/vmcs_host/linux" + CFLAGS="$CFLAGS $RPI_CFLAGS" + SDL_CFLAGS="$SDL_CFLAGS $RPI_CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS $RPI_CFLAGS" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lbcm_host -ldl" + + if test x$enable_video = xyes; then + SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c" + $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} raspberry" + fi + ;; *-*-netbsd*) ARCH=netbsd ;; *-*-openbsd*) ARCH=openbsd ;; *-*-sysv5*) ARCH=sysv5 ;; diff --git a/jni/SDL2-2.0.3/configure.in b/jni/SDL2-2.0.4/configure.in similarity index 99% rename from jni/SDL2-2.0.3/configure.in rename to jni/SDL2-2.0.4/configure.in index 265be964..f585d01a 100644 --- a/jni/SDL2-2.0.3/configure.in +++ b/jni/SDL2-2.0.4/configure.in @@ -2846,6 +2846,21 @@ case "$host" in *-*-bsdi*) ARCH=bsdi ;; *-*-freebsd*) ARCH=freebsd ;; *-*-dragonfly*) ARCH=freebsd ;; + *-raspberry-netbsd*) + # Raspberry Pi + ARCH=netbsd + RPI_CFLAGS="-I/usr/pkg/include -I/usr/pkg/include/interface/vcos/pthreads -I/usr/pkg/include/interface/vmcs_host/linux" + CFLAGS="$CFLAGS $RPI_CFLAGS" + SDL_CFLAGS="$SDL_CFLAGS $RPI_CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS $RPI_CFLAGS" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lbcm_host -ldl" + + if test x$enable_video = xyes; then + SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c" + $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} raspberry" + fi + ;; *-*-netbsd*) ARCH=netbsd ;; *-*-openbsd*) ARCH=openbsd ;; *-*-sysv5*) ARCH=sysv5 ;; diff --git a/jni/SDL2-2.0.3/debian/changelog b/jni/SDL2-2.0.4/debian/changelog similarity index 100% rename from jni/SDL2-2.0.3/debian/changelog rename to jni/SDL2-2.0.4/debian/changelog diff --git a/jni/SDL2-2.0.3/debian/compat b/jni/SDL2-2.0.4/debian/compat similarity index 100% rename from jni/SDL2-2.0.3/debian/compat rename to jni/SDL2-2.0.4/debian/compat diff --git a/jni/SDL2-2.0.3/debian/control b/jni/SDL2-2.0.4/debian/control similarity index 100% rename from jni/SDL2-2.0.3/debian/control rename to jni/SDL2-2.0.4/debian/control diff --git a/jni/SDL2-2.0.3/debian/copyright b/jni/SDL2-2.0.4/debian/copyright similarity index 98% rename from jni/SDL2-2.0.3/debian/copyright rename to jni/SDL2-2.0.4/debian/copyright index 31860bbe..8ce26d1c 100644 --- a/jni/SDL2-2.0.3/debian/copyright +++ b/jni/SDL2-2.0.4/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Sam Lantinga Source: http://www.libsdl.org/ Files: * -Copyright: 1997-2015 Sam Lantinga +Copyright: 1997-2016 Sam Lantinga License: zlib/libpng Files: src/libm/* @@ -12,7 +12,7 @@ Copyright: 1993 by Sun Microsystems, Inc. All rights reserved. License: SunPro Files: src/main/windows/SDL_windows_main.c -Copyright: 2015 Sam Lantinga +Copyright: 2016 Sam Lantinga License: PublicDomain_Sam_Lantinga Comment: SDL_main.c, placed in the public domain by Sam Lantinga 4/13/98 @@ -36,7 +36,7 @@ Copyright: 1998 Gareth McCaughan License: Gareth_McCaughan Files: src/test/SDL_test_md5.c -Copyright: 1997-2015 Sam Lantinga +Copyright: 1997-2016 Sam Lantinga 1990 RSA Data Security, Inc. License: zlib/libpng and RSA_Data_Security @@ -50,12 +50,12 @@ Copyright: 1994-2003 The XFree86 Project, Inc. License: MIT/X11 Files: test/testhaptic.c -Copyright: 1997-2015 Sam Lantinga +Copyright: 1997-2016 Sam Lantinga 2008 Edgar Simo Serra License: BSD_3_clause Files: test/testrumble.c -Copyright: 1997-2015 Sam Lantinga +Copyright: 1997-2016 Sam Lantinga 2011 Edgar Simo Serra License: BSD_3_clause @@ -173,7 +173,7 @@ License: BSD_3_clause (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Comment: - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga . This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/debian/docs b/jni/SDL2-2.0.4/debian/docs similarity index 100% rename from jni/SDL2-2.0.3/debian/docs rename to jni/SDL2-2.0.4/debian/docs diff --git a/jni/SDL2-2.0.3/debian/libsdl2-dev.install b/jni/SDL2-2.0.4/debian/libsdl2-dev.install similarity index 100% rename from jni/SDL2-2.0.3/debian/libsdl2-dev.install rename to jni/SDL2-2.0.4/debian/libsdl2-dev.install diff --git a/jni/SDL2-2.0.3/debian/libsdl2-dev.manpages b/jni/SDL2-2.0.4/debian/libsdl2-dev.manpages similarity index 100% rename from jni/SDL2-2.0.3/debian/libsdl2-dev.manpages rename to jni/SDL2-2.0.4/debian/libsdl2-dev.manpages diff --git a/jni/SDL2-2.0.3/debian/libsdl2.install b/jni/SDL2-2.0.4/debian/libsdl2.install similarity index 100% rename from jni/SDL2-2.0.3/debian/libsdl2.install rename to jni/SDL2-2.0.4/debian/libsdl2.install diff --git a/jni/SDL2-2.0.3/debian/rules b/jni/SDL2-2.0.4/debian/rules similarity index 100% rename from jni/SDL2-2.0.3/debian/rules rename to jni/SDL2-2.0.4/debian/rules diff --git a/jni/SDL2-2.0.3/debian/sdl2-config.1 b/jni/SDL2-2.0.4/debian/sdl2-config.1 similarity index 100% rename from jni/SDL2-2.0.3/debian/sdl2-config.1 rename to jni/SDL2-2.0.4/debian/sdl2-config.1 diff --git a/jni/SDL2-2.0.3/debian/source/format b/jni/SDL2-2.0.4/debian/source/format similarity index 100% rename from jni/SDL2-2.0.3/debian/source/format rename to jni/SDL2-2.0.4/debian/source/format diff --git a/jni/SDL2-2.0.3/debian/watch b/jni/SDL2-2.0.4/debian/watch similarity index 100% rename from jni/SDL2-2.0.3/debian/watch rename to jni/SDL2-2.0.4/debian/watch diff --git a/jni/SDL2-2.0.3/docs/README-android.md b/jni/SDL2-2.0.4/docs/README-android.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-android.md rename to jni/SDL2-2.0.4/docs/README-android.md diff --git a/jni/SDL2-2.0.3/docs/README-cmake.md b/jni/SDL2-2.0.4/docs/README-cmake.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-cmake.md rename to jni/SDL2-2.0.4/docs/README-cmake.md diff --git a/jni/SDL2-2.0.3/docs/README-directfb.md b/jni/SDL2-2.0.4/docs/README-directfb.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-directfb.md rename to jni/SDL2-2.0.4/docs/README-directfb.md diff --git a/jni/SDL2-2.0.3/docs/README-dynapi.md b/jni/SDL2-2.0.4/docs/README-dynapi.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-dynapi.md rename to jni/SDL2-2.0.4/docs/README-dynapi.md diff --git a/jni/SDL2-2.0.3/docs/README-gesture.md b/jni/SDL2-2.0.4/docs/README-gesture.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-gesture.md rename to jni/SDL2-2.0.4/docs/README-gesture.md diff --git a/jni/SDL2-2.0.3/docs/README-hg.md b/jni/SDL2-2.0.4/docs/README-hg.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-hg.md rename to jni/SDL2-2.0.4/docs/README-hg.md diff --git a/jni/SDL2-2.0.3/docs/README-ios.md b/jni/SDL2-2.0.4/docs/README-ios.md similarity index 79% rename from jni/SDL2-2.0.3/docs/README-ios.md rename to jni/SDL2-2.0.4/docs/README-ios.md index 69c35d6f..a0afffb1 100644 --- a/jni/SDL2-2.0.3/docs/README-ios.md +++ b/jni/SDL2-2.0.4/docs/README-ios.md @@ -47,17 +47,45 @@ Using the Simple DirectMedia Layer for iOS FIXME: This needs to be updated for the latest methods Here is the easiest method: -1. Build the SDL libraries (libSDL.a and libSDLSimulator.a) and the iPhone SDL Application template. -2. Install the iPhone SDL Application template by copying it to one of XCode's template directories. I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/XCode/Project Templates/" and placing it there. +1. Build the SDL library (libSDL2.a) and the iPhone SDL Application template. +2. Install the iPhone SDL Application template by copying it to one of Xcode's template directories. I recommend creating a directory called "SDL" in "/Developer/Platforms/iOS.platform/Developer/Library/Xcode/Project Templates/" and placing it there. 3. Start a new project using the template. The project should be immediately ready for use with SDL. Here is a more manual method: -1. Create a new iPhone view based application. -2. Build the SDL static libraries (libSDL.a and libSDLSimulator.a) for iPhone and include them in your project. XCode will ignore the library that is not currently of the correct architecture, hence your app will work both on iPhone and in the iPhone Simulator. +1. Create a new iOS view based application. +2. Build the SDL static library (libSDL2.a) for iOS and include them in your project. Xcode will ignore the library that is not currently of the correct architecture, hence your app will work both on iOS and in the iOS Simulator. 3. Include the SDL header files in your project. -4. Remove the ApplicationDelegate.h and ApplicationDelegate.m files -- SDL for iPhone provides its own UIApplicationDelegate. Remove MainWindow.xib -- SDL for iPhone produces its user interface programmatically. -5. Delete the contents of main.m and program your app as a regular SDL program instead. You may replace main.m with your own main.c, but you must tell XCode not to use the project prefix file, as it includes Objective-C code. +4. Remove the ApplicationDelegate.h and ApplicationDelegate.m files -- SDL for iOS provides its own UIApplicationDelegate. Remove MainWindow.xib -- SDL for iOS produces its user interface programmatically. +5. Delete the contents of main.m and program your app as a regular SDL program instead. You may replace main.m with your own main.c, but you must tell Xcode not to use the project prefix file, as it includes Objective-C code. +============================================================================== +Notes -- Retina / High-DPI and window sizes +============================================================================== + +Window and display mode sizes in SDL are in "screen coordinates" (or "points", +in Apple's terminology) rather than in pixels. On iOS this means that a window +created on an iPhone 6 will have a size in screen coordinates of 375 x 667, +rather than a size in pixels of 750 x 1334. All iOS apps are expected to +size their content based on screen coordinates / points rather than pixels, +as this allows different iOS devices to have different pixel densities +(Retina versus non-Retina screens, etc.) without apps caring too much. + +By default SDL will not use the full pixel density of the screen on +Retina/high-dpi capable devices. Use the SDL_WINDOW_ALLOW_HIGHDPI flag when +creating your window to enable high-dpi support. + +When high-dpi support is enabled, SDL_GetWindowSize and display mode sizes +will still be in "screen coordinates" rather than pixels, but the window will +have a much greater pixel density when the device supports it, and the +SDL_GL_GetDrawableSize or SDL_GetRendererOutputSize functions (depending on +whether raw OpenGL or the SDL_Render API is used) can be queried to determine +the size in pixels of the drawable screen framebuffer. + +Some OpenGL ES functions such as glViewport expect sizes in pixels rather than +sizes in screen coordinates. When doing 2D rendering with OpenGL ES, an +orthographic projection matrix using the size in screen coordinates +(SDL_GetWindowSize) can be used in order to display content at the same scale +no matter whether a Retina device is used or not. ============================================================================== Notes -- Application events @@ -203,7 +231,7 @@ Loading Shared Objects: Game Center ============================================================================== -Game Center integration requires that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using: +Game Center integration might require that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using: int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); diff --git a/jni/SDL2-2.0.3/docs/README-linux.md b/jni/SDL2-2.0.4/docs/README-linux.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-linux.md rename to jni/SDL2-2.0.4/docs/README-linux.md diff --git a/jni/SDL2-2.0.3/docs/README-macosx.md b/jni/SDL2-2.0.4/docs/README-macosx.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-macosx.md rename to jni/SDL2-2.0.4/docs/README-macosx.md diff --git a/jni/SDL2-2.0.3/docs/README-nacl.md b/jni/SDL2-2.0.4/docs/README-nacl.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-nacl.md rename to jni/SDL2-2.0.4/docs/README-nacl.md diff --git a/jni/SDL2-2.0.3/docs/README-pandora.md b/jni/SDL2-2.0.4/docs/README-pandora.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-pandora.md rename to jni/SDL2-2.0.4/docs/README-pandora.md diff --git a/jni/SDL2-2.0.3/docs/README-platforms.md b/jni/SDL2-2.0.4/docs/README-platforms.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-platforms.md rename to jni/SDL2-2.0.4/docs/README-platforms.md diff --git a/jni/SDL2-2.0.3/docs/README-porting.md b/jni/SDL2-2.0.4/docs/README-porting.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-porting.md rename to jni/SDL2-2.0.4/docs/README-porting.md diff --git a/jni/SDL2-2.0.3/docs/README-psp.md b/jni/SDL2-2.0.4/docs/README-psp.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-psp.md rename to jni/SDL2-2.0.4/docs/README-psp.md diff --git a/jni/SDL2-2.0.3/docs/README-raspberrypi.md b/jni/SDL2-2.0.4/docs/README-raspberrypi.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-raspberrypi.md rename to jni/SDL2-2.0.4/docs/README-raspberrypi.md diff --git a/jni/SDL2-2.0.3/docs/README-touch.md b/jni/SDL2-2.0.4/docs/README-touch.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-touch.md rename to jni/SDL2-2.0.4/docs/README-touch.md diff --git a/jni/SDL2-2.0.3/docs/README-wince.md b/jni/SDL2-2.0.4/docs/README-wince.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-wince.md rename to jni/SDL2-2.0.4/docs/README-wince.md diff --git a/jni/SDL2-2.0.3/docs/README-windows.md b/jni/SDL2-2.0.4/docs/README-windows.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-windows.md rename to jni/SDL2-2.0.4/docs/README-windows.md diff --git a/jni/SDL2-2.0.3/docs/README-winrt.md b/jni/SDL2-2.0.4/docs/README-winrt.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README-winrt.md rename to jni/SDL2-2.0.4/docs/README-winrt.md diff --git a/jni/SDL2-2.0.3/docs/README.md b/jni/SDL2-2.0.4/docs/README.md similarity index 100% rename from jni/SDL2-2.0.3/docs/README.md rename to jni/SDL2-2.0.4/docs/README.md diff --git a/jni/SDL2-2.0.3/docs/doxyfile b/jni/SDL2-2.0.4/docs/doxyfile similarity index 100% rename from jni/SDL2-2.0.3/docs/doxyfile rename to jni/SDL2-2.0.4/docs/doxyfile diff --git a/jni/SDL2-2.0.3/doxygen_warn.txt b/jni/SDL2-2.0.4/doxygen_warn.txt similarity index 100% rename from jni/SDL2-2.0.3/doxygen_warn.txt rename to jni/SDL2-2.0.4/doxygen_warn.txt diff --git a/jni/SDL2-2.0.3/include/SDL.h b/jni/SDL2-2.0.4/include/SDL.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL.h rename to jni/SDL2-2.0.4/include/SDL.h index 9d1ede33..7647b511 100644 --- a/jni/SDL2-2.0.3/include/SDL.h +++ b/jni/SDL2-2.0.4/include/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_assert.h b/jni/SDL2-2.0.4/include/SDL_assert.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_assert.h rename to jni/SDL2-2.0.4/include/SDL_assert.h index 6889514d..402981f9 100644 --- a/jni/SDL2-2.0.3/include/SDL_assert.h +++ b/jni/SDL2-2.0.4/include/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_atomic.h b/jni/SDL2-2.0.4/include/SDL_atomic.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_atomic.h rename to jni/SDL2-2.0.4/include/SDL_atomic.h index bb01eb9e..56aa81df 100644 --- a/jni/SDL2-2.0.3/include/SDL_atomic.h +++ b/jni/SDL2-2.0.4/include/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_audio.h b/jni/SDL2-2.0.4/include/SDL_audio.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_audio.h rename to jni/SDL2-2.0.4/include/SDL_audio.h index 359005d0..4f655214 100644 --- a/jni/SDL2-2.0.3/include/SDL_audio.h +++ b/jni/SDL2-2.0.4/include/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_bits.h b/jni/SDL2-2.0.4/include/SDL_bits.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_bits.h rename to jni/SDL2-2.0.4/include/SDL_bits.h index c62766d9..528da2ea 100644 --- a/jni/SDL2-2.0.3/include/SDL_bits.h +++ b/jni/SDL2-2.0.4/include/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_blendmode.h b/jni/SDL2-2.0.4/include/SDL_blendmode.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_blendmode.h rename to jni/SDL2-2.0.4/include/SDL_blendmode.h index c7fa09f7..56d8ad66 100644 --- a/jni/SDL2-2.0.3/include/SDL_blendmode.h +++ b/jni/SDL2-2.0.4/include/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_clipboard.h b/jni/SDL2-2.0.4/include/SDL_clipboard.h similarity index 96% rename from jni/SDL2-2.0.3/include/SDL_clipboard.h rename to jni/SDL2-2.0.4/include/SDL_clipboard.h index 3ad20548..a5556f21 100644 --- a/jni/SDL2-2.0.3/include/SDL_clipboard.h +++ b/jni/SDL2-2.0.4/include/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config.h b/jni/SDL2-2.0.4/include/SDL_config.h similarity index 96% rename from jni/SDL2-2.0.3/include/SDL_config.h rename to jni/SDL2-2.0.4/include/SDL_config.h index eda76602..4270c78b 100644 --- a/jni/SDL2-2.0.3/include/SDL_config.h +++ b/jni/SDL2-2.0.4/include/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config.h.cmake b/jni/SDL2-2.0.4/include/SDL_config.h.cmake similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_config.h.cmake rename to jni/SDL2-2.0.4/include/SDL_config.h.cmake index 3d5e3abf..44173a05 100644 --- a/jni/SDL2-2.0.3/include/SDL_config.h.cmake +++ b/jni/SDL2-2.0.4/include/SDL_config.h.cmake @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -197,6 +197,7 @@ #cmakedefine SDL_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@ /* Enable various audio drivers */ +#cmakedefine SDL_AUDIO_DRIVER_ANDROID @SDL_AUDIO_DRIVER_ANDROID@ #cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@ #cmakedefine SDL_AUDIO_DRIVER_ALSA_DYNAMIC @SDL_AUDIO_DRIVER_ALSA_DYNAMIC@ #cmakedefine SDL_AUDIO_DRIVER_ARTS @SDL_AUDIO_DRIVER_ARTS@ @@ -230,6 +231,7 @@ #cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@ #cmakedefine SDL_INPUT_LINUXKD @SDL_INPUT_LINUXKD@ #cmakedefine SDL_INPUT_TSLIB @SDL_INPUT_TSLIB@ +#cmakedefine SDL_JOYSTICK_ANDROID @SDL_JOYSTICK_ANDROID@ #cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@ #cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@ #cmakedefine SDL_JOYSTICK_XINPUT @SDL_JOYSTICK_XINPUT@ @@ -268,6 +270,7 @@ #cmakedefine SDL_TIMER_WINCE @SDL_TIMER_WINCE@ /* Enable various video drivers */ +#cmakedefine SDL_VIDEO_DRIVER_ANDROID @SDL_VIDEO_DRIVER_ANDROID@ #cmakedefine SDL_VIDEO_DRIVER_HAIKU @SDL_VIDEO_DRIVER_HAIKU@ #cmakedefine SDL_VIDEO_DRIVER_COCOA @SDL_VIDEO_DRIVER_COCOA@ #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB @SDL_VIDEO_DRIVER_DIRECTFB@ @@ -331,6 +334,7 @@ #cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@ /* Enable system power support */ +#cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@ #cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@ #cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@ #cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@ @@ -339,6 +343,7 @@ #cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@ /* Enable system filesystem support */ +#cmakedefine SDL_FILESYSTEM_ANDROID @SDL_FILESYSTEM_ANDROID@ #cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@ #cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@ #cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@ diff --git a/jni/SDL2-2.0.3/include/SDL_config.h.in b/jni/SDL2-2.0.4/include/SDL_config.h.in similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_config.h.in rename to jni/SDL2-2.0.4/include/SDL_config.h.in index 2c74868b..2071be4e 100644 --- a/jni/SDL2-2.0.3/include/SDL_config.h.in +++ b/jni/SDL2-2.0.4/include/SDL_config.h.in @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_android.h b/jni/SDL2-2.0.4/include/SDL_config_android.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_android.h rename to jni/SDL2-2.0.4/include/SDL_config_android.h index 8d5f1e5f..a388ba8d 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_android.h +++ b/jni/SDL2-2.0.4/include/SDL_config_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_iphoneos.h b/jni/SDL2-2.0.4/include/SDL_config_iphoneos.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_iphoneos.h rename to jni/SDL2-2.0.4/include/SDL_config_iphoneos.h index 2d741c38..304c8920 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_iphoneos.h +++ b/jni/SDL2-2.0.4/include/SDL_config_iphoneos.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_macosx.h b/jni/SDL2-2.0.4/include/SDL_config_macosx.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_macosx.h rename to jni/SDL2-2.0.4/include/SDL_config_macosx.h index e4ce82fc..5c8b7e03 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_macosx.h +++ b/jni/SDL2-2.0.4/include/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_minimal.h b/jni/SDL2-2.0.4/include/SDL_config_minimal.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_config_minimal.h rename to jni/SDL2-2.0.4/include/SDL_config_minimal.h index 7721abc9..3c9d09af 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_minimal.h +++ b/jni/SDL2-2.0.4/include/SDL_config_minimal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_pandora.h b/jni/SDL2-2.0.4/include/SDL_config_pandora.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_pandora.h rename to jni/SDL2-2.0.4/include/SDL_config_pandora.h index 530e78f1..7b51e571 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_pandora.h +++ b/jni/SDL2-2.0.4/include/SDL_config_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_psp.h b/jni/SDL2-2.0.4/include/SDL_config_psp.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_psp.h rename to jni/SDL2-2.0.4/include/SDL_config_psp.h index 26bf9d1a..a6e49609 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_psp.h +++ b/jni/SDL2-2.0.4/include/SDL_config_psp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_windows.h b/jni/SDL2-2.0.4/include/SDL_config_windows.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_windows.h rename to jni/SDL2-2.0.4/include/SDL_config_windows.h index 067d7f31..890986cc 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_windows.h +++ b/jni/SDL2-2.0.4/include/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_winrt.h b/jni/SDL2-2.0.4/include/SDL_config_winrt.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_config_winrt.h rename to jni/SDL2-2.0.4/include/SDL_config_winrt.h index 29bf79fe..e392f773 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_winrt.h +++ b/jni/SDL2-2.0.4/include/SDL_config_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_config_wiz.h b/jni/SDL2-2.0.4/include/SDL_config_wiz.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_config_wiz.h rename to jni/SDL2-2.0.4/include/SDL_config_wiz.h index 4b3c5a2a..e090a1a9 100644 --- a/jni/SDL2-2.0.3/include/SDL_config_wiz.h +++ b/jni/SDL2-2.0.4/include/SDL_config_wiz.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -97,7 +97,6 @@ #define HAVE_NANOSLEEP 1 #define HAVE_POW 1 -#define SDL_CDROM_DISABLED 1 #define SDL_AUDIO_DRIVER_DUMMY 1 #define SDL_AUDIO_DRIVER_OSS 1 diff --git a/jni/SDL2-2.0.3/include/SDL_copying.h b/jni/SDL2-2.0.4/include/SDL_copying.h similarity index 93% rename from jni/SDL2-2.0.3/include/SDL_copying.h rename to jni/SDL2-2.0.4/include/SDL_copying.h index 6fd65219..212da0ee 100644 --- a/jni/SDL2-2.0.3/include/SDL_copying.h +++ b/jni/SDL2-2.0.4/include/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_cpuinfo.h b/jni/SDL2-2.0.4/include/SDL_cpuinfo.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_cpuinfo.h rename to jni/SDL2-2.0.4/include/SDL_cpuinfo.h index 30d09cce..d0ba47bf 100644 --- a/jni/SDL2-2.0.3/include/SDL_cpuinfo.h +++ b/jni/SDL2-2.0.4/include/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_egl.h b/jni/SDL2-2.0.4/include/SDL_egl.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_egl.h rename to jni/SDL2-2.0.4/include/SDL_egl.h index 358d869b..bea2a6c0 100644 --- a/jni/SDL2-2.0.3/include/SDL_egl.h +++ b/jni/SDL2-2.0.4/include/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_endian.h b/jni/SDL2-2.0.4/include/SDL_endian.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_endian.h rename to jni/SDL2-2.0.4/include/SDL_endian.h index ec7841c4..9100b103 100644 --- a/jni/SDL2-2.0.3/include/SDL_endian.h +++ b/jni/SDL2-2.0.4/include/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_error.h b/jni/SDL2-2.0.4/include/SDL_error.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_error.h rename to jni/SDL2-2.0.4/include/SDL_error.h index 1720c43f..2f3b4b50 100644 --- a/jni/SDL2-2.0.3/include/SDL_error.h +++ b/jni/SDL2-2.0.4/include/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_events.h b/jni/SDL2-2.0.4/include/SDL_events.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_events.h rename to jni/SDL2-2.0.4/include/SDL_events.h index 8a364c2a..1437f4c7 100644 --- a/jni/SDL2-2.0.3/include/SDL_events.h +++ b/jni/SDL2-2.0.4/include/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_filesystem.h b/jni/SDL2-2.0.4/include/SDL_filesystem.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_filesystem.h rename to jni/SDL2-2.0.4/include/SDL_filesystem.h index 15bda498..02999ed2 100644 --- a/jni/SDL2-2.0.3/include/SDL_filesystem.h +++ b/jni/SDL2-2.0.4/include/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_gamecontroller.h b/jni/SDL2-2.0.4/include/SDL_gamecontroller.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_gamecontroller.h rename to jni/SDL2-2.0.4/include/SDL_gamecontroller.h index 5459387b..42087eea 100644 --- a/jni/SDL2-2.0.3/include/SDL_gamecontroller.h +++ b/jni/SDL2-2.0.4/include/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_gesture.h b/jni/SDL2-2.0.4/include/SDL_gesture.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_gesture.h rename to jni/SDL2-2.0.4/include/SDL_gesture.h index 44983486..3c29ca7a 100644 --- a/jni/SDL2-2.0.3/include/SDL_gesture.h +++ b/jni/SDL2-2.0.4/include/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_haptic.h b/jni/SDL2-2.0.4/include/SDL_haptic.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_haptic.h rename to jni/SDL2-2.0.4/include/SDL_haptic.h index 0e6f523b..b36d78b1 100644 --- a/jni/SDL2-2.0.3/include/SDL_haptic.h +++ b/jni/SDL2-2.0.4/include/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_hints.h b/jni/SDL2-2.0.4/include/SDL_hints.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_hints.h rename to jni/SDL2-2.0.4/include/SDL_hints.h index c28cbad8..3bd5435f 100644 --- a/jni/SDL2-2.0.3/include/SDL_hints.h +++ b/jni/SDL2-2.0.4/include/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_joystick.h b/jni/SDL2-2.0.4/include/SDL_joystick.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_joystick.h rename to jni/SDL2-2.0.4/include/SDL_joystick.h index 78176321..266f3b38 100644 --- a/jni/SDL2-2.0.3/include/SDL_joystick.h +++ b/jni/SDL2-2.0.4/include/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_keyboard.h b/jni/SDL2-2.0.4/include/SDL_keyboard.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_keyboard.h rename to jni/SDL2-2.0.4/include/SDL_keyboard.h index 1ad58ee3..bbba0f07 100644 --- a/jni/SDL2-2.0.3/include/SDL_keyboard.h +++ b/jni/SDL2-2.0.4/include/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_keycode.h b/jni/SDL2-2.0.4/include/SDL_keycode.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_keycode.h rename to jni/SDL2-2.0.4/include/SDL_keycode.h index 66980cef..7be96357 100644 --- a/jni/SDL2-2.0.3/include/SDL_keycode.h +++ b/jni/SDL2-2.0.4/include/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_loadso.h b/jni/SDL2-2.0.4/include/SDL_loadso.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_loadso.h rename to jni/SDL2-2.0.4/include/SDL_loadso.h index db7493ad..3d540bd7 100644 --- a/jni/SDL2-2.0.3/include/SDL_loadso.h +++ b/jni/SDL2-2.0.4/include/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_log.h b/jni/SDL2-2.0.4/include/SDL_log.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_log.h rename to jni/SDL2-2.0.4/include/SDL_log.h index 6ffbfc99..09be1104 100644 --- a/jni/SDL2-2.0.3/include/SDL_log.h +++ b/jni/SDL2-2.0.4/include/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_main.h b/jni/SDL2-2.0.4/include/SDL_main.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_main.h rename to jni/SDL2-2.0.4/include/SDL_main.h index c5168ba6..9ce3754e 100644 --- a/jni/SDL2-2.0.3/include/SDL_main.h +++ b/jni/SDL2-2.0.4/include/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_messagebox.h b/jni/SDL2-2.0.4/include/SDL_messagebox.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_messagebox.h rename to jni/SDL2-2.0.4/include/SDL_messagebox.h index 44d458f4..ec370dbb 100644 --- a/jni/SDL2-2.0.3/include/SDL_messagebox.h +++ b/jni/SDL2-2.0.4/include/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_mouse.h b/jni/SDL2-2.0.4/include/SDL_mouse.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_mouse.h rename to jni/SDL2-2.0.4/include/SDL_mouse.h index 1ae31269..ea9622f0 100644 --- a/jni/SDL2-2.0.3/include/SDL_mouse.h +++ b/jni/SDL2-2.0.4/include/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_mutex.h b/jni/SDL2-2.0.4/include/SDL_mutex.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_mutex.h rename to jni/SDL2-2.0.4/include/SDL_mutex.h index 2765210a..b7e39734 100644 --- a/jni/SDL2-2.0.3/include/SDL_mutex.h +++ b/jni/SDL2-2.0.4/include/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_name.h b/jni/SDL2-2.0.4/include/SDL_name.h similarity index 94% rename from jni/SDL2-2.0.3/include/SDL_name.h rename to jni/SDL2-2.0.4/include/SDL_name.h index b6a413a2..06cd4a5e 100644 --- a/jni/SDL2-2.0.3/include/SDL_name.h +++ b/jni/SDL2-2.0.4/include/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_opengl.h b/jni/SDL2-2.0.4/include/SDL_opengl.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_opengl.h rename to jni/SDL2-2.0.4/include/SDL_opengl.h index aebe30eb..780919bc 100644 --- a/jni/SDL2-2.0.3/include/SDL_opengl.h +++ b/jni/SDL2-2.0.4/include/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_opengl_glext.h b/jni/SDL2-2.0.4/include/SDL_opengl_glext.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_opengl_glext.h rename to jni/SDL2-2.0.4/include/SDL_opengl_glext.h diff --git a/jni/SDL2-2.0.3/include/SDL_opengles.h b/jni/SDL2-2.0.4/include/SDL_opengles.h similarity index 95% rename from jni/SDL2-2.0.3/include/SDL_opengles.h rename to jni/SDL2-2.0.4/include/SDL_opengles.h index 49c709c1..bcc12777 100644 --- a/jni/SDL2-2.0.3/include/SDL_opengles.h +++ b/jni/SDL2-2.0.4/include/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_opengles2.h b/jni/SDL2-2.0.4/include/SDL_opengles2.h similarity index 96% rename from jni/SDL2-2.0.3/include/SDL_opengles2.h rename to jni/SDL2-2.0.4/include/SDL_opengles2.h index 13ebd9dc..edcd1a24 100644 --- a/jni/SDL2-2.0.3/include/SDL_opengles2.h +++ b/jni/SDL2-2.0.4/include/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_opengles2_gl2.h b/jni/SDL2-2.0.4/include/SDL_opengles2_gl2.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_opengles2_gl2.h rename to jni/SDL2-2.0.4/include/SDL_opengles2_gl2.h diff --git a/jni/SDL2-2.0.3/include/SDL_opengles2_gl2ext.h b/jni/SDL2-2.0.4/include/SDL_opengles2_gl2ext.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_opengles2_gl2ext.h rename to jni/SDL2-2.0.4/include/SDL_opengles2_gl2ext.h diff --git a/jni/SDL2-2.0.3/include/SDL_opengles2_gl2platform.h b/jni/SDL2-2.0.4/include/SDL_opengles2_gl2platform.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_opengles2_gl2platform.h rename to jni/SDL2-2.0.4/include/SDL_opengles2_gl2platform.h diff --git a/jni/SDL2-2.0.3/include/SDL_opengles2_khrplatform.h b/jni/SDL2-2.0.4/include/SDL_opengles2_khrplatform.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_opengles2_khrplatform.h rename to jni/SDL2-2.0.4/include/SDL_opengles2_khrplatform.h diff --git a/jni/SDL2-2.0.3/include/SDL_pixels.h b/jni/SDL2-2.0.4/include/SDL_pixels.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_pixels.h rename to jni/SDL2-2.0.4/include/SDL_pixels.h index ba24a47d..8499c328 100644 --- a/jni/SDL2-2.0.3/include/SDL_pixels.h +++ b/jni/SDL2-2.0.4/include/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_platform.h b/jni/SDL2-2.0.4/include/SDL_platform.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_platform.h rename to jni/SDL2-2.0.4/include/SDL_platform.h index 75e4c653..c6c21398 100644 --- a/jni/SDL2-2.0.3/include/SDL_platform.h +++ b/jni/SDL2-2.0.4/include/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_power.h b/jni/SDL2-2.0.4/include/SDL_power.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_power.h rename to jni/SDL2-2.0.4/include/SDL_power.h index 89eb1718..24c05011 100644 --- a/jni/SDL2-2.0.3/include/SDL_power.h +++ b/jni/SDL2-2.0.4/include/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_quit.h b/jni/SDL2-2.0.4/include/SDL_quit.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_quit.h rename to jni/SDL2-2.0.4/include/SDL_quit.h index 0108ff04..cc06f28d 100644 --- a/jni/SDL2-2.0.3/include/SDL_quit.h +++ b/jni/SDL2-2.0.4/include/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_rect.h b/jni/SDL2-2.0.4/include/SDL_rect.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_rect.h rename to jni/SDL2-2.0.4/include/SDL_rect.h index ebe51674..bbcb9a3b 100644 --- a/jni/SDL2-2.0.3/include/SDL_rect.h +++ b/jni/SDL2-2.0.4/include/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_render.h b/jni/SDL2-2.0.4/include/SDL_render.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_render.h rename to jni/SDL2-2.0.4/include/SDL_render.h index de2749cc..e4ed2af6 100644 --- a/jni/SDL2-2.0.3/include/SDL_render.h +++ b/jni/SDL2-2.0.4/include/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -215,7 +215,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size of a rendering context. + * \brief Get the output size in pixels of a rendering context. */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); diff --git a/jni/SDL2-2.0.3/include/SDL_revision.h b/jni/SDL2-2.0.4/include/SDL_revision.h similarity index 100% rename from jni/SDL2-2.0.3/include/SDL_revision.h rename to jni/SDL2-2.0.4/include/SDL_revision.h diff --git a/jni/SDL2-2.0.3/include/SDL_rwops.h b/jni/SDL2-2.0.4/include/SDL_rwops.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_rwops.h rename to jni/SDL2-2.0.4/include/SDL_rwops.h index c8b024be..f460ae7d 100644 --- a/jni/SDL2-2.0.3/include/SDL_rwops.h +++ b/jni/SDL2-2.0.4/include/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_scancode.h b/jni/SDL2-2.0.4/include/SDL_scancode.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_scancode.h rename to jni/SDL2-2.0.4/include/SDL_scancode.h index 4bf86180..0af1dd59 100644 --- a/jni/SDL2-2.0.3/include/SDL_scancode.h +++ b/jni/SDL2-2.0.4/include/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_shape.h b/jni/SDL2-2.0.4/include/SDL_shape.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_shape.h rename to jni/SDL2-2.0.4/include/SDL_shape.h index 157d6127..db10a8f0 100644 --- a/jni/SDL2-2.0.3/include/SDL_shape.h +++ b/jni/SDL2-2.0.4/include/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_stdinc.h b/jni/SDL2-2.0.4/include/SDL_stdinc.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_stdinc.h rename to jni/SDL2-2.0.4/include/SDL_stdinc.h index c1f2b6dd..887bcd2d 100644 --- a/jni/SDL2-2.0.3/include/SDL_stdinc.h +++ b/jni/SDL2-2.0.4/include/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_surface.h b/jni/SDL2-2.0.4/include/SDL_surface.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_surface.h rename to jni/SDL2-2.0.4/include/SDL_surface.h index 3634f7d3..e63ca890 100644 --- a/jni/SDL2-2.0.3/include/SDL_surface.h +++ b/jni/SDL2-2.0.4/include/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_system.h b/jni/SDL2-2.0.4/include/SDL_system.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_system.h rename to jni/SDL2-2.0.4/include/SDL_system.h index bdc4f968..5da9adb4 100644 --- a/jni/SDL2-2.0.3/include/SDL_system.h +++ b/jni/SDL2-2.0.4/include/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_syswm.h b/jni/SDL2-2.0.4/include/SDL_syswm.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_syswm.h rename to jni/SDL2-2.0.4/include/SDL_syswm.h index a3441fdc..1056e526 100644 --- a/jni/SDL2-2.0.3/include/SDL_syswm.h +++ b/jni/SDL2-2.0.4/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test.h b/jni/SDL2-2.0.4/include/SDL_test.h similarity index 96% rename from jni/SDL2-2.0.3/include/SDL_test.h rename to jni/SDL2-2.0.4/include/SDL_test.h index 77b350bd..217847bf 100644 --- a/jni/SDL2-2.0.3/include/SDL_test.h +++ b/jni/SDL2-2.0.4/include/SDL_test.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_assert.h b/jni/SDL2-2.0.4/include/SDL_test_assert.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_assert.h rename to jni/SDL2-2.0.4/include/SDL_test_assert.h index a800a384..29277e12 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_assert.h +++ b/jni/SDL2-2.0.4/include/SDL_test_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_common.h b/jni/SDL2-2.0.4/include/SDL_test_common.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_common.h rename to jni/SDL2-2.0.4/include/SDL_test_common.h index bb671fa5..0ebf31cb 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_common.h +++ b/jni/SDL2-2.0.4/include/SDL_test_common.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_compare.h b/jni/SDL2-2.0.4/include/SDL_test_compare.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_test_compare.h rename to jni/SDL2-2.0.4/include/SDL_test_compare.h index bc121336..772cf9fb 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_compare.h +++ b/jni/SDL2-2.0.4/include/SDL_test_compare.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_crc32.h b/jni/SDL2-2.0.4/include/SDL_test_crc32.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_crc32.h rename to jni/SDL2-2.0.4/include/SDL_test_crc32.h index cf9ea23d..572a3d95 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_crc32.h +++ b/jni/SDL2-2.0.4/include/SDL_test_crc32.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_font.h b/jni/SDL2-2.0.4/include/SDL_test_font.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_test_font.h rename to jni/SDL2-2.0.4/include/SDL_test_font.h index 42696d74..3378ea85 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_font.h +++ b/jni/SDL2-2.0.4/include/SDL_test_font.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_fuzzer.h b/jni/SDL2-2.0.4/include/SDL_test_fuzzer.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_test_fuzzer.h rename to jni/SDL2-2.0.4/include/SDL_test_fuzzer.h index 59c89a50..9603652b 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_fuzzer.h +++ b/jni/SDL2-2.0.4/include/SDL_test_fuzzer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_harness.h b/jni/SDL2-2.0.4/include/SDL_test_harness.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_harness.h rename to jni/SDL2-2.0.4/include/SDL_test_harness.h index b3389315..74c0950c 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_harness.h +++ b/jni/SDL2-2.0.4/include/SDL_test_harness.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_images.h b/jni/SDL2-2.0.4/include/SDL_test_images.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_test_images.h rename to jni/SDL2-2.0.4/include/SDL_test_images.h index 9b9f979b..8c64b4fe 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_images.h +++ b/jni/SDL2-2.0.4/include/SDL_test_images.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_log.h b/jni/SDL2-2.0.4/include/SDL_test_log.h similarity index 96% rename from jni/SDL2-2.0.3/include/SDL_test_log.h rename to jni/SDL2-2.0.4/include/SDL_test_log.h index 968d9b32..73a5c016 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_log.h +++ b/jni/SDL2-2.0.4/include/SDL_test_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_md5.h b/jni/SDL2-2.0.4/include/SDL_test_md5.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_md5.h rename to jni/SDL2-2.0.4/include/SDL_test_md5.h index 52ea2c9a..f2d9a7d7 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_md5.h +++ b/jni/SDL2-2.0.4/include/SDL_test_md5.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_test_random.h b/jni/SDL2-2.0.4/include/SDL_test_random.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_test_random.h rename to jni/SDL2-2.0.4/include/SDL_test_random.h index 925205df..91c36526 100644 --- a/jni/SDL2-2.0.3/include/SDL_test_random.h +++ b/jni/SDL2-2.0.4/include/SDL_test_random.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_thread.h b/jni/SDL2-2.0.4/include/SDL_thread.h similarity index 99% rename from jni/SDL2-2.0.3/include/SDL_thread.h rename to jni/SDL2-2.0.4/include/SDL_thread.h index 797767f8..377e6c73 100644 --- a/jni/SDL2-2.0.3/include/SDL_thread.h +++ b/jni/SDL2-2.0.4/include/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_timer.h b/jni/SDL2-2.0.4/include/SDL_timer.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_timer.h rename to jni/SDL2-2.0.4/include/SDL_timer.h index 1f2a0206..e0d3785e 100644 --- a/jni/SDL2-2.0.3/include/SDL_timer.h +++ b/jni/SDL2-2.0.4/include/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_touch.h b/jni/SDL2-2.0.4/include/SDL_touch.h similarity index 97% rename from jni/SDL2-2.0.3/include/SDL_touch.h rename to jni/SDL2-2.0.4/include/SDL_touch.h index 68ff1714..2643e367 100644 --- a/jni/SDL2-2.0.3/include/SDL_touch.h +++ b/jni/SDL2-2.0.4/include/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_types.h b/jni/SDL2-2.0.4/include/SDL_types.h similarity index 94% rename from jni/SDL2-2.0.3/include/SDL_types.h rename to jni/SDL2-2.0.4/include/SDL_types.h index 1a1877fa..5118af21 100644 --- a/jni/SDL2-2.0.3/include/SDL_types.h +++ b/jni/SDL2-2.0.4/include/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_version.h b/jni/SDL2-2.0.4/include/SDL_version.h similarity index 98% rename from jni/SDL2-2.0.3/include/SDL_version.h rename to jni/SDL2-2.0.4/include/SDL_version.h index 0b364d07..de1f1605 100644 --- a/jni/SDL2-2.0.3/include/SDL_version.h +++ b/jni/SDL2-2.0.4/include/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/SDL_video.h b/jni/SDL2-2.0.4/include/SDL_video.h similarity index 93% rename from jni/SDL2-2.0.3/include/SDL_video.h rename to jni/SDL2-2.0.4/include/SDL_video.h index f466165b..52dbbc76 100644 --- a/jni/SDL2-2.0.3/include/SDL_video.h +++ b/jni/SDL2-2.0.4/include/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,8 +53,8 @@ extern "C" { typedef struct { Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ + int w; /**< width, in screen coordinates */ + int h; /**< height, in screen coordinates */ int refresh_rate; /**< refresh rate (or zero for unspecified) */ void *driverdata; /**< driver-specific data, initialize to 0 */ } SDL_DisplayMode; @@ -143,7 +143,9 @@ typedef enum SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 */ SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ + SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as + a result of an API call or through the + system or user changing the window size. */ SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size @@ -412,8 +414,8 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * ::SDL_WINDOWPOS_UNDEFINED. * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. + * \param w The width of the window, in screen coordinates. + * \param h The height of the window, in screen coordinates. * \param flags The flags for the window, a mask of any of the following: * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, @@ -423,6 +425,12 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * * \return The id of the window created, or zero if window creation failed. * + * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query + * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize() + * or SDL_GetRendererOutputSize() to query the drawable size in pixels. + * * \sa SDL_DestroyWindow() */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, @@ -513,10 +521,10 @@ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, * \brief Set the position of a window. * * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. + * \param x The x coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. * * \note The window coordinate origin is the upper left of the display. * @@ -529,8 +537,10 @@ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, * \brief Get the position of a window. * * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL + * \param x Pointer to variable for storing the x position, in screen + * coordinates. May be NULL. + * \param y Pointer to variable for storing the y position, in screen + * coordinates. May be NULL. * * \sa SDL_SetWindowPosition() */ @@ -541,12 +551,17 @@ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, * \brief Set the size of a window's client area. * * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 + * \param w The width of the window, in screen coordinates. Must be >0. + * \param h The height of the window, in screen coordinates. Must be >0. * * \note You can't change the size of a fullscreen window, it automatically * matches the size of the display mode. * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * * \sa SDL_GetWindowSize() */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, @@ -556,8 +571,15 @@ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, * \brief Get the size of a window's client area. * * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width, in screen + * coordinates. May be NULL. + * \param h Pointer to variable for storing the height, in screen + * coordinates. May be NULL. + * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * * \sa SDL_SetWindowSize() */ @@ -1009,11 +1031,12 @@ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable (for use with glViewport). + * \brief Get the size of a window's underlying drawable in pixels (for use + * with glViewport). * * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width in pixels, may be NULL + * \param h Pointer to variable for storing the height in pixels, may be NULL * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a diff --git a/jni/SDL2-2.0.3/include/begin_code.h b/jni/SDL2-2.0.4/include/begin_code.h similarity index 98% rename from jni/SDL2-2.0.3/include/begin_code.h rename to jni/SDL2-2.0.4/include/begin_code.h index c032400f..04e78c64 100644 --- a/jni/SDL2-2.0.3/include/begin_code.h +++ b/jni/SDL2-2.0.4/include/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/include/close_code.h b/jni/SDL2-2.0.4/include/close_code.h similarity index 95% rename from jni/SDL2-2.0.3/include/close_code.h rename to jni/SDL2-2.0.4/include/close_code.h index 73f6c818..d908b00e 100644 --- a/jni/SDL2-2.0.3/include/close_code.h +++ b/jni/SDL2-2.0.4/include/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/clean_premake.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/clean_premake.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/clean_premake.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/clean_premake.bat diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/cygwin.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/cygwin.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/cygwin.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/cygwin.bat diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/make.debug.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/make.debug.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/make.debug.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/make.debug.bat diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/make.release.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/make.release.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/make.release.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/make.release.bat diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/premake4.exe b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/premake4.exe similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/premake4.exe rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/premake4.exe diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/run.tests.debug.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/run.tests.debug.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/run.tests.debug.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/run.tests.debug.bat diff --git a/jni/SDL2-2.0.3/premake/Cygwin/build-scripts/run.tests.release.bat b/jni/SDL2-2.0.4/premake/Cygwin/build-scripts/run.tests.release.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/Cygwin/build-scripts/run.tests.release.bat rename to jni/SDL2-2.0.4/premake/Cygwin/build-scripts/run.tests.release.bat diff --git a/jni/SDL2-2.0.3/premake/Linux/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/Linux/SDL_config_premake.h similarity index 99% rename from jni/SDL2-2.0.3/premake/Linux/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/Linux/SDL_config_premake.h index c865684b..1bc2e4d7 100644 --- a/jni/SDL2-2.0.3/premake/Linux/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/Linux/SDL_config_premake.h @@ -1,7 +1,7 @@ /* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/Linux/build-scripts/clean_premake.sh b/jni/SDL2-2.0.4/premake/Linux/build-scripts/clean_premake.sh similarity index 100% rename from jni/SDL2-2.0.3/premake/Linux/build-scripts/clean_premake.sh rename to jni/SDL2-2.0.4/premake/Linux/build-scripts/clean_premake.sh diff --git a/jni/SDL2-2.0.3/premake/Linux/build-scripts/gmake.sh b/jni/SDL2-2.0.4/premake/Linux/build-scripts/gmake.sh similarity index 100% rename from jni/SDL2-2.0.3/premake/Linux/build-scripts/gmake.sh rename to jni/SDL2-2.0.4/premake/Linux/build-scripts/gmake.sh diff --git a/jni/SDL2-2.0.3/premake/Linux/build-scripts/premake4 b/jni/SDL2-2.0.4/premake/Linux/build-scripts/premake4 similarity index 100% rename from jni/SDL2-2.0.3/premake/Linux/build-scripts/premake4 rename to jni/SDL2-2.0.4/premake/Linux/build-scripts/premake4 diff --git a/jni/SDL2-2.0.3/premake/Linux/build-scripts/run.tests.sh b/jni/SDL2-2.0.4/premake/Linux/build-scripts/run.tests.sh similarity index 100% rename from jni/SDL2-2.0.3/premake/Linux/build-scripts/run.tests.sh rename to jni/SDL2-2.0.4/premake/Linux/build-scripts/run.tests.sh diff --git a/jni/SDL2-2.0.3/premake/MinGW/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/MinGW/SDL_config_premake.h similarity index 95% rename from jni/SDL2-2.0.3/premake/MinGW/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/MinGW/SDL_config_premake.h index 7ec79a3b..cf8c1651 100644 --- a/jni/SDL2-2.0.3/premake/MinGW/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/MinGW/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/MinGW/build-scripts/clean_premake.bat b/jni/SDL2-2.0.4/premake/MinGW/build-scripts/clean_premake.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/MinGW/build-scripts/clean_premake.bat rename to jni/SDL2-2.0.4/premake/MinGW/build-scripts/clean_premake.bat diff --git a/jni/SDL2-2.0.3/premake/MinGW/build-scripts/mingw.bat b/jni/SDL2-2.0.4/premake/MinGW/build-scripts/mingw.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/MinGW/build-scripts/mingw.bat rename to jni/SDL2-2.0.4/premake/MinGW/build-scripts/mingw.bat diff --git a/jni/SDL2-2.0.3/premake/MinGW/build-scripts/premake4.exe b/jni/SDL2-2.0.4/premake/MinGW/build-scripts/premake4.exe similarity index 100% rename from jni/SDL2-2.0.3/premake/MinGW/build-scripts/premake4.exe rename to jni/SDL2-2.0.4/premake/MinGW/build-scripts/premake4.exe diff --git a/jni/SDL2-2.0.3/premake/MinGW/build-scripts/run.tests.bat b/jni/SDL2-2.0.4/premake/MinGW/build-scripts/run.tests.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/MinGW/build-scripts/run.tests.bat rename to jni/SDL2-2.0.4/premake/MinGW/build-scripts/run.tests.bat diff --git a/jni/SDL2-2.0.3/premake/README-cygwin.txt b/jni/SDL2-2.0.4/premake/README-cygwin.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-cygwin.txt rename to jni/SDL2-2.0.4/premake/README-cygwin.txt diff --git a/jni/SDL2-2.0.3/premake/README-ios.txt b/jni/SDL2-2.0.4/premake/README-ios.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-ios.txt rename to jni/SDL2-2.0.4/premake/README-ios.txt diff --git a/jni/SDL2-2.0.3/premake/README-linux.txt b/jni/SDL2-2.0.4/premake/README-linux.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-linux.txt rename to jni/SDL2-2.0.4/premake/README-linux.txt diff --git a/jni/SDL2-2.0.3/premake/README-macosx.txt b/jni/SDL2-2.0.4/premake/README-macosx.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-macosx.txt rename to jni/SDL2-2.0.4/premake/README-macosx.txt diff --git a/jni/SDL2-2.0.3/premake/README-mingw.txt b/jni/SDL2-2.0.4/premake/README-mingw.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-mingw.txt rename to jni/SDL2-2.0.4/premake/README-mingw.txt diff --git a/jni/SDL2-2.0.3/premake/README-windows.txt b/jni/SDL2-2.0.4/premake/README-windows.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README-windows.txt rename to jni/SDL2-2.0.4/premake/README-windows.txt diff --git a/jni/SDL2-2.0.3/premake/README.txt b/jni/SDL2-2.0.4/premake/README.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/README.txt rename to jni/SDL2-2.0.4/premake/README.txt diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL.sln b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL.sln similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL.sln rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL.sln diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2/SDL2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2/SDL2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2/SDL2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2/SDL2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2main/SDL2main.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2main/SDL2main.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2main/SDL2main.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2main/SDL2main.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2test/SDL2test.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2test/SDL2test.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL2test/SDL2test.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL2test/SDL2test.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL_config_premake.h similarity index 95% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL_config_premake.h index 7139c23c..8d1d31d9 100644 --- a/jni/SDL2-2.0.3/premake/VisualC/VS2008/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/VisualC/VS2008/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/checkkeys/checkkeys.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/checkkeys/checkkeys.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/checkkeys/checkkeys.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/checkkeys/checkkeys.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/loopwave/loopwave.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/loopwave/loopwave.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/loopwave/loopwave.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/loopwave/loopwave.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testatomic/testatomic.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testatomic/testatomic.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testatomic/testatomic.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testatomic/testatomic.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testaudioinfo/testaudioinfo.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testaudioinfo/testaudioinfo.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testaudioinfo/testaudioinfo.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testaudioinfo/testaudioinfo.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testautomation/testautomation.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testautomation/testautomation.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testautomation/testautomation.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testautomation/testautomation.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testchessboard/testchessboard.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testchessboard/testchessboard.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testchessboard/testchessboard.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testchessboard/testchessboard.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testdraw2/testdraw2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testdraw2/testdraw2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testdraw2/testdraw2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testdraw2/testdraw2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testerror/testerror.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testerror/testerror.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testerror/testerror.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testerror/testerror.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testfile/testfile.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testfile/testfile.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testfile/testfile.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testfile/testfile.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testfilesystem/testfilesystem.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testfilesystem/testfilesystem.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testfilesystem/testfilesystem.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testfilesystem/testfilesystem.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgamecontroller/testgamecontroller.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgamecontroller/testgamecontroller.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgamecontroller/testgamecontroller.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgamecontroller/testgamecontroller.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgesture/testgesture.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgesture/testgesture.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgesture/testgesture.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgesture/testgesture.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgl2/testgl2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgl2/testgl2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgl2/testgl2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgl2/testgl2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgles/testgles.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgles/testgles.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testgles/testgles.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testgles/testgles.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testhaptic/testhaptic.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testhaptic/testhaptic.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testhaptic/testhaptic.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testhaptic/testhaptic.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testiconv/testiconv.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testiconv/testiconv.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testiconv/testiconv.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testiconv/testiconv.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testime/testime.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testime/testime.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testime/testime.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testime/testime.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testjoystick/testjoystick.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testjoystick/testjoystick.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testjoystick/testjoystick.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testjoystick/testjoystick.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testkeys/testkeys.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testkeys/testkeys.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testkeys/testkeys.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testkeys/testkeys.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testloadso/testloadso.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testloadso/testloadso.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testloadso/testloadso.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testloadso/testloadso.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testlock/testlock.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testlock/testlock.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testlock/testlock.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testlock/testlock.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testmessage/testmessage.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testmessage/testmessage.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testmessage/testmessage.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testmessage/testmessage.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testmultiaudio/testmultiaudio.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testmultiaudio/testmultiaudio.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testmultiaudio/testmultiaudio.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testmultiaudio/testmultiaudio.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testnative/testnative.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testnative/testnative.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testnative/testnative.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testnative/testnative.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testoverlay2/testoverlay2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testoverlay2/testoverlay2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testoverlay2/testoverlay2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testoverlay2/testoverlay2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testplatform/testplatform.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testplatform/testplatform.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testplatform/testplatform.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testplatform/testplatform.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testpower/testpower.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testpower/testpower.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testpower/testpower.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testpower/testpower.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrelative/testrelative.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrelative/testrelative.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrelative/testrelative.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrelative/testrelative.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrendercopyex/testrendercopyex.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrendercopyex/testrendercopyex.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrendercopyex/testrendercopyex.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrendercopyex/testrendercopyex.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrendertarget/testrendertarget.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrendertarget/testrendertarget.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrendertarget/testrendertarget.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrendertarget/testrendertarget.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testresample/testresample.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testresample/testresample.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testresample/testresample.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testresample/testresample.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrumble/testrumble.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrumble/testrumble.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testrumble/testrumble.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testrumble/testrumble.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testscale/testscale.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testscale/testscale.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testscale/testscale.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testscale/testscale.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testsem/testsem.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testsem/testsem.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testsem/testsem.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testsem/testsem.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testshader/testshader.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testshader/testshader.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testshader/testshader.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testshader/testshader.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testshape/testshape.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testshape/testshape.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testshape/testshape.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testshape/testshape.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testsprite2/testsprite2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testsprite2/testsprite2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testsprite2/testsprite2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testsprite2/testsprite2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testspriteminimal/testspriteminimal.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testspriteminimal/testspriteminimal.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testspriteminimal/testspriteminimal.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testspriteminimal/testspriteminimal.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/teststreaming/teststreaming.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/teststreaming/teststreaming.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/teststreaming/teststreaming.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/teststreaming/teststreaming.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testthread/testthread.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testthread/testthread.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testthread/testthread.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testthread/testthread.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testtimer/testtimer.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testtimer/testtimer.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testtimer/testtimer.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testtimer/testtimer.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testver/testver.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testver/testver.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testver/testver.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testver/testver.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testwm2/testwm2.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testwm2/testwm2.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/testwm2/testwm2.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/testwm2/testwm2.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/torturethread/torturethread.vcproj b/jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/torturethread/torturethread.vcproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2008/tests/torturethread/torturethread.vcproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2008/tests/torturethread/torturethread.vcproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL.sln b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL.sln similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL.sln rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL.sln diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2/SDL2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2/SDL2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2/SDL2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2/SDL2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2main/SDL2main.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL2test/SDL2test.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL_config_premake.h similarity index 95% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL_config_premake.h index 7139c23c..8d1d31d9 100644 --- a/jni/SDL2-2.0.3/premake/VisualC/VS2010/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/VisualC/VS2010/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/checkkeys/checkkeys.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/loopwave/loopwave.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testatomic/testatomic.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testaudioinfo/testaudioinfo.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testautomation/testautomation.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testchessboard/testchessboard.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testdraw2/testdraw2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testerror/testerror.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfile/testfile.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testfilesystem/testfilesystem.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgamecontroller/testgamecontroller.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgesture/testgesture.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgl2/testgl2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testgles/testgles.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testhaptic/testhaptic.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testiconv/testiconv.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testime/testime.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testime/testime.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testime/testime.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testime/testime.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testime/testime.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testime/testime.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testime/testime.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testime/testime.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testjoystick/testjoystick.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testkeys/testkeys.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testloadso/testloadso.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testlock/testlock.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmessage/testmessage.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testmultiaudio/testmultiaudio.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testnative/testnative.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testoverlay2/testoverlay2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testplatform/testplatform.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testpower/testpower.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrelative/testrelative.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendercopyex/testrendercopyex.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrendertarget/testrendertarget.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testresample/testresample.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testrumble/testrumble.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testscale/testscale.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsem/testsem.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshader/testshader.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testshape/testshape.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testsprite2/testsprite2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testspriteminimal/testspriteminimal.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/teststreaming/teststreaming.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testthread/testthread.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testtimer/testtimer.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testver/testver.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testver/testver.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testver/testver.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testver/testver.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testver/testver.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testver/testver.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testver/testver.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testver/testver.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/testwm2/testwm2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2010/tests/torturethread/torturethread.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL.sln b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL.sln similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL.sln rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL.sln diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2/SDL2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2/SDL2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2/SDL2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2/SDL2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2main/SDL2main.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL_config_premake.h similarity index 95% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL_config_premake.h index 7139c23c..8d1d31d9 100644 --- a/jni/SDL2-2.0.3/premake/VisualC/VS2012/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/VisualC/VS2012/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/checkkeys/checkkeys.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/loopwave/loopwave.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testatomic/testatomic.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testaudioinfo/testaudioinfo.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testautomation/testautomation.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testchessboard/testchessboard.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testdraw2/testdraw2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testerror/testerror.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfile/testfile.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testfilesystem/testfilesystem.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgamecontroller/testgamecontroller.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgesture/testgesture.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgl2/testgl2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testgles/testgles.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testhaptic/testhaptic.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testiconv/testiconv.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testime/testime.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testime/testime.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testime/testime.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testime/testime.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testime/testime.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testime/testime.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testime/testime.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testime/testime.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testjoystick/testjoystick.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testkeys/testkeys.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testloadso/testloadso.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testlock/testlock.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmessage/testmessage.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testmultiaudio/testmultiaudio.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testnative/testnative.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testoverlay2/testoverlay2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testplatform/testplatform.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testpower/testpower.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrelative/testrelative.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendercopyex/testrendercopyex.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrendertarget/testrendertarget.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testresample/testresample.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testrumble/testrumble.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testscale/testscale.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsem/testsem.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshader/testshader.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testshape/testshape.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testsprite2/testsprite2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testspriteminimal/testspriteminimal.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/teststreaming/teststreaming.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testthread/testthread.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testtimer/testtimer.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testver/testver.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testver/testver.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testver/testver.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testver/testver.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testver/testver.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testver/testver.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testver/testver.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testver/testver.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/testwm2/testwm2.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj diff --git a/jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj.filters b/jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj.filters similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj.filters rename to jni/SDL2-2.0.4/premake/VisualC/VS2012/tests/torturethread/torturethread.vcxproj.filters diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/build.all.vs2010.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/build.all.vs2010.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/build.all.vs2010.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/build.all.vs2010.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/check.bin.compatibility.vs2010.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/check.bin.compatibility.vs2010.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/check.bin.compatibility.vs2010.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/check.bin.compatibility.vs2010.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/clean_premake.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/clean_premake.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/clean_premake.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/clean_premake.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/generate.all.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/generate.all.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/generate.all.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/generate.all.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/premake4.exe b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/premake4.exe similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/premake4.exe rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/premake4.exe diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/run.tests.vs2010.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/run.tests.vs2010.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/run.tests.vs2010.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/run.tests.vs2010.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2008.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2008.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2008.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2008.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2010.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2010.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2010.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2010.bat diff --git a/jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2012.bat b/jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2012.bat similarity index 100% rename from jni/SDL2-2.0.3/premake/VisualC/build-scripts/vs2012.bat rename to jni/SDL2-2.0.4/premake/VisualC/build-scripts/vs2012.bat diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/accelerometer/accelerometer.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/accelerometer/accelerometer.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/accelerometer/accelerometer.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/accelerometer/accelerometer.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/fireworks/fireworks.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/fireworks/fireworks.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/fireworks/fireworks.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/fireworks/fireworks.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/happy/happy.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/happy/happy.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/happy/happy.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/happy/happy.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/keyboard/keyboard.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/keyboard/keyboard.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/keyboard/keyboard.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/keyboard/keyboard.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/mixer/mixer.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/mixer/mixer.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/mixer/mixer.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/mixer/mixer.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/rectangles/rectangles.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/rectangles/rectangles.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/rectangles/rectangles.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/rectangles/rectangles.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/touch/touch.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/touch/touch.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/Demos/touch/touch.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/Demos/touch/touch.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL.xcworkspace/contents.xcworkspacedata b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL.xcworkspace/contents.xcworkspacedata similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/SDL.xcworkspace/contents.xcworkspacedata rename to jni/SDL2-2.0.4/premake/Xcode-iOS/SDL.xcworkspace/contents.xcworkspacedata diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2main/SDL2main.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2main/SDL2main.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2main/SDL2main.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2main/SDL2main.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2test/SDL2test.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2test/SDL2test.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/SDL2test/SDL2test.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode-iOS/SDL2test/SDL2test.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL_config_premake.h similarity index 98% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/Xcode-iOS/SDL_config_premake.h index 47b47ef7..c4a8a1bf 100644 --- a/jni/SDL2-2.0.3/premake/Xcode-iOS/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/Xcode-iOS/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/clean_premake.command b/jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/clean_premake.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/clean_premake.command rename to jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/clean_premake.command diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/premake4 b/jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/premake4 similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/premake4 rename to jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/premake4 diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/xcode3.command b/jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/xcode3.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/xcode3.command rename to jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/xcode3.command diff --git a/jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/xcode4.command b/jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/xcode4.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode-iOS/build-scripts/xcode4.command rename to jni/SDL2-2.0.4/premake/Xcode-iOS/build-scripts/xcode4.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2main/SDL2main.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2main/SDL2main.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2main/SDL2main.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2main/SDL2main.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2test/SDL2test.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2test/SDL2test.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL2test/SDL2test.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL2test/SDL2test.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL_config_premake.h similarity index 98% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL_config_premake.h index 878b3c20..35da85c7 100644 --- a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/loopwave/loopwave.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/loopwave/loopwave.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/loopwave/loopwave.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/loopwave/loopwave.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testatomic/testatomic.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testatomic/testatomic.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testatomic/testatomic.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testatomic/testatomic.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testautomation/testautomation.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testautomation/testautomation.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testautomation/testautomation.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testautomation/testautomation.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testerror/testerror.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testerror/testerror.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testerror/testerror.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testerror/testerror.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testfile/testfile.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testfile/testfile.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testfile/testfile.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testfile/testfile.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgesture/testgesture.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgesture/testgesture.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgesture/testgesture.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgesture/testgesture.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgl2/testgl2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgl2/testgl2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgl2/testgl2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgl2/testgl2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgles/testgles.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgles/testgles.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testgles/testgles.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testgles/testgles.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testiconv/testiconv.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testiconv/testiconv.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testiconv/testiconv.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testiconv/testiconv.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testime/testime.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testime/testime.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testime/testime.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testime/testime.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testkeys/testkeys.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testkeys/testkeys.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testkeys/testkeys.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testkeys/testkeys.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testloadso/testloadso.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testloadso/testloadso.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testloadso/testloadso.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testloadso/testloadso.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testlock/testlock.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testlock/testlock.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testlock/testlock.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testlock/testlock.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testmessage/testmessage.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testmessage/testmessage.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testmessage/testmessage.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testmessage/testmessage.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testnative/testnative.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testnative/testnative.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testnative/testnative.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testnative/testnative.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testplatform/testplatform.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testplatform/testplatform.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testplatform/testplatform.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testplatform/testplatform.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testpower/testpower.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testpower/testpower.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testpower/testpower.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testpower/testpower.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrelative/testrelative.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrelative/testrelative.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrelative/testrelative.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrelative/testrelative.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testresample/testresample.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testresample/testresample.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testresample/testresample.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testresample/testresample.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrumble/testrumble.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrumble/testrumble.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testrumble/testrumble.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testrumble/testrumble.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testscale/testscale.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testscale/testscale.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testscale/testscale.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testscale/testscale.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testsem/testsem.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testsem/testsem.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testsem/testsem.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testsem/testsem.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testshader/testshader.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testshader/testshader.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testshader/testshader.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testshader/testshader.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testshape/testshape.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testshape/testshape.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testshape/testshape.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testshape/testshape.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testthread/testthread.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testthread/testthread.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testthread/testthread.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testthread/testthread.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testtimer/testtimer.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testtimer/testtimer.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testtimer/testtimer.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testtimer/testtimer.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testver/testver.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testver/testver.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testver/testver.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testver/testver.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testwm2/testwm2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testwm2/testwm2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/testwm2/testwm2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/testwm2/testwm2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/torturethread/torturethread.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/torturethread/torturethread.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode3/tests/torturethread/torturethread.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode3/tests/torturethread/torturethread.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL.xcworkspace/contents.xcworkspacedata b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL.xcworkspace/contents.xcworkspacedata similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL.xcworkspace/contents.xcworkspacedata rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL.xcworkspace/contents.xcworkspacedata diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2main/SDL2main.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2main/SDL2main.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2main/SDL2main.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2main/SDL2main.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2test/SDL2test.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2test/SDL2test.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL2test/SDL2test.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL2test/SDL2test.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL_config_premake.h b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL_config_premake.h similarity index 98% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL_config_premake.h rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL_config_premake.h index 878b3c20..35da85c7 100644 --- a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/SDL_config_premake.h +++ b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/SDL_config_premake.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/checkkeys/checkkeys.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/loopwave/loopwave.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/loopwave/loopwave.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/loopwave/loopwave.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/loopwave/loopwave.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testatomic/testatomic.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testatomic/testatomic.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testatomic/testatomic.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testatomic/testatomic.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testaudioinfo/testaudioinfo.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testautomation/testautomation.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testautomation/testautomation.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testautomation/testautomation.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testautomation/testautomation.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testchessboard/testchessboard.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testdraw2/testdraw2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testerror/testerror.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testerror/testerror.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testerror/testerror.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testerror/testerror.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testfile/testfile.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testfile/testfile.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testfile/testfile.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testfile/testfile.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testfilesystem/testfilesystem.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgamecontroller/testgamecontroller.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgesture/testgesture.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgesture/testgesture.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgesture/testgesture.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgesture/testgesture.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgl2/testgl2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgl2/testgl2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgl2/testgl2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgl2/testgl2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgles/testgles.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgles/testgles.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testgles/testgles.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testgles/testgles.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testhaptic/testhaptic.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testiconv/testiconv.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testiconv/testiconv.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testiconv/testiconv.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testiconv/testiconv.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testime/testime.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testime/testime.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testime/testime.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testime/testime.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testjoystick/testjoystick.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testkeys/testkeys.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testkeys/testkeys.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testkeys/testkeys.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testkeys/testkeys.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testloadso/testloadso.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testloadso/testloadso.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testloadso/testloadso.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testloadso/testloadso.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testlock/testlock.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testlock/testlock.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testlock/testlock.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testlock/testlock.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testmessage/testmessage.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testmessage/testmessage.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testmessage/testmessage.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testmessage/testmessage.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testmultiaudio/testmultiaudio.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testnative/testnative.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testnative/testnative.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testnative/testnative.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testnative/testnative.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testoverlay2/testoverlay2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testplatform/testplatform.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testplatform/testplatform.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testplatform/testplatform.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testplatform/testplatform.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testpower/testpower.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testpower/testpower.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testpower/testpower.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testpower/testpower.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrelative/testrelative.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrelative/testrelative.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrelative/testrelative.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrelative/testrelative.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrendercopyex/testrendercopyex.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrendertarget/testrendertarget.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testresample/testresample.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testresample/testresample.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testresample/testresample.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testresample/testresample.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrumble/testrumble.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrumble/testrumble.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testrumble/testrumble.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testrumble/testrumble.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testscale/testscale.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testscale/testscale.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testscale/testscale.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testscale/testscale.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testsem/testsem.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testsem/testsem.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testsem/testsem.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testsem/testsem.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testshader/testshader.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testshader/testshader.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testshader/testshader.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testshader/testshader.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testshape/testshape.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testshape/testshape.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testshape/testshape.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testshape/testshape.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testsprite2/testsprite2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testspriteminimal/testspriteminimal.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/teststreaming/teststreaming.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testthread/testthread.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testthread/testthread.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testthread/testthread.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testthread/testthread.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testtimer/testtimer.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testtimer/testtimer.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testtimer/testtimer.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testtimer/testtimer.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testver/testver.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testver/testver.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testver/testver.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testver/testver.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testwm2/testwm2.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testwm2/testwm2.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/testwm2/testwm2.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/testwm2/testwm2.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/torturethread/torturethread.xcodeproj/project.pbxproj b/jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/torturethread/torturethread.xcodeproj/project.pbxproj similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/Xcode4/tests/torturethread/torturethread.xcodeproj/project.pbxproj rename to jni/SDL2-2.0.4/premake/Xcode/Xcode4/tests/torturethread/torturethread.xcodeproj/project.pbxproj diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode3.i386.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode3.i386.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode3.i386.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode3.i386.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode3.x86_64.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode3.x86_64.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode3.x86_64.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode3.x86_64.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode4.i386.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode4.i386.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode4.i386.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode4.i386.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode4.x86_64.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode4.x86_64.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/build.all.xcode4.x86_64.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/build.all.xcode4.x86_64.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/clean_premake.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/clean_premake.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/clean_premake.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/clean_premake.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/premake4 b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/premake4 similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/premake4 rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/premake4 diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/run.tests.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/run.tests.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/run.tests.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/run.tests.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/xcode3.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/xcode3.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/xcode3.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/xcode3.command diff --git a/jni/SDL2-2.0.3/premake/Xcode/build-scripts/xcode4.command b/jni/SDL2-2.0.4/premake/Xcode/build-scripts/xcode4.command similarity index 100% rename from jni/SDL2-2.0.3/premake/Xcode/build-scripts/xcode4.command rename to jni/SDL2-2.0.4/premake/Xcode/build-scripts/xcode4.command diff --git a/jni/SDL2-2.0.3/premake/changelog b/jni/SDL2-2.0.4/premake/changelog similarity index 100% rename from jni/SDL2-2.0.3/premake/changelog rename to jni/SDL2-2.0.4/premake/changelog diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_cygwin.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_cygwin.template.h similarity index 98% rename from jni/SDL2-2.0.3/premake/config/SDL_config_cygwin.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_cygwin.template.h index 8f38d44c..b5886707 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_cygwin.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_cygwin.template.h @@ -1,7 +1,7 @@ /* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_iphoneos.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_iphoneos.template.h similarity index 98% rename from jni/SDL2-2.0.3/premake/config/SDL_config_iphoneos.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_iphoneos.template.h index 2a965947..956e40a7 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_iphoneos.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_iphoneos.template.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_linux.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_linux.template.h similarity index 98% rename from jni/SDL2-2.0.3/premake/config/SDL_config_linux.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_linux.template.h index d35037cf..9b530c9d 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_linux.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_linux.template.h @@ -1,7 +1,7 @@ /* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_macosx.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_macosx.template.h similarity index 98% rename from jni/SDL2-2.0.3/premake/config/SDL_config_macosx.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_macosx.template.h index 1a4d8d56..7c25d9bc 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_macosx.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_macosx.template.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_minimal.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_minimal.template.h similarity index 97% rename from jni/SDL2-2.0.3/premake/config/SDL_config_minimal.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_minimal.template.h index adf60ed9..f209a09f 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_minimal.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_minimal.template.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/config/SDL_config_windows.template.h b/jni/SDL2-2.0.4/premake/config/SDL_config_windows.template.h similarity index 98% rename from jni/SDL2-2.0.3/premake/config/SDL_config_windows.template.h rename to jni/SDL2-2.0.4/premake/config/SDL_config_windows.template.h index 9274f620..25b68a55 100644 --- a/jni/SDL2-2.0.3/premake/config/SDL_config_windows.template.h +++ b/jni/SDL2-2.0.4/premake/config/SDL_config_windows.template.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/patches/709.patch b/jni/SDL2-2.0.4/premake/patches/709.patch similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/709.patch rename to jni/SDL2-2.0.4/premake/patches/709.patch diff --git a/jni/SDL2-2.0.3/premake/patches/711.patch b/jni/SDL2-2.0.4/premake/patches/711.patch similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/711.patch rename to jni/SDL2-2.0.4/premake/patches/711.patch diff --git a/jni/SDL2-2.0.3/premake/patches/712.patch b/jni/SDL2-2.0.4/premake/patches/712.patch similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/712.patch rename to jni/SDL2-2.0.4/premake/patches/712.patch diff --git a/jni/SDL2-2.0.3/premake/patches/713.patch b/jni/SDL2-2.0.4/premake/patches/713.patch similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/713.patch rename to jni/SDL2-2.0.4/premake/patches/713.patch diff --git a/jni/SDL2-2.0.3/premake/patches/iOS.patch b/jni/SDL2-2.0.4/premake/patches/iOS.patch similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/iOS.patch rename to jni/SDL2-2.0.4/premake/patches/iOS.patch diff --git a/jni/SDL2-2.0.3/premake/patches/premake.patches.txt b/jni/SDL2-2.0.4/premake/patches/premake.patches.txt similarity index 100% rename from jni/SDL2-2.0.3/premake/patches/premake.patches.txt rename to jni/SDL2-2.0.4/premake/patches/premake.patches.txt diff --git a/jni/SDL2-2.0.3/premake/premake4.lua b/jni/SDL2-2.0.4/premake/premake4.lua similarity index 99% rename from jni/SDL2-2.0.3/premake/premake4.lua rename to jni/SDL2-2.0.4/premake/premake4.lua index eb2dfcd1..1202c0e9 100755 --- a/jni/SDL2-2.0.3/premake/premake4.lua +++ b/jni/SDL2-2.0.4/premake/premake4.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/SDL2.lua b/jni/SDL2-2.0.4/premake/projects/SDL2.lua similarity index 99% rename from jni/SDL2-2.0.3/premake/projects/SDL2.lua rename to jni/SDL2-2.0.4/premake/projects/SDL2.lua index 923f953a..ef946f4e 100755 --- a/jni/SDL2-2.0.3/premake/projects/SDL2.lua +++ b/jni/SDL2-2.0.4/premake/projects/SDL2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/SDL2main.lua b/jni/SDL2-2.0.4/premake/projects/SDL2main.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/SDL2main.lua rename to jni/SDL2-2.0.4/premake/projects/SDL2main.lua index 771a169c..3dffb52a 100755 --- a/jni/SDL2-2.0.3/premake/projects/SDL2main.lua +++ b/jni/SDL2-2.0.4/premake/projects/SDL2main.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/SDL2test.lua b/jni/SDL2-2.0.4/premake/projects/SDL2test.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/SDL2test.lua rename to jni/SDL2-2.0.4/premake/projects/SDL2test.lua index 0ac6382c..9bf9664c 100755 --- a/jni/SDL2-2.0.3/premake/projects/SDL2test.lua +++ b/jni/SDL2-2.0.4/premake/projects/SDL2test.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/accelerometer.lua b/jni/SDL2-2.0.4/premake/projects/accelerometer.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/accelerometer.lua rename to jni/SDL2-2.0.4/premake/projects/accelerometer.lua index df24a7ba..d5cb18ea 100755 --- a/jni/SDL2-2.0.3/premake/projects/accelerometer.lua +++ b/jni/SDL2-2.0.4/premake/projects/accelerometer.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/checkkeys.lua b/jni/SDL2-2.0.4/premake/projects/checkkeys.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/checkkeys.lua rename to jni/SDL2-2.0.4/premake/projects/checkkeys.lua index e1709403..0711d33d 100755 --- a/jni/SDL2-2.0.3/premake/projects/checkkeys.lua +++ b/jni/SDL2-2.0.4/premake/projects/checkkeys.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/fireworks.lua b/jni/SDL2-2.0.4/premake/projects/fireworks.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/fireworks.lua rename to jni/SDL2-2.0.4/premake/projects/fireworks.lua index 110c6547..dd0b84a6 100755 --- a/jni/SDL2-2.0.3/premake/projects/fireworks.lua +++ b/jni/SDL2-2.0.4/premake/projects/fireworks.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/happy.lua b/jni/SDL2-2.0.4/premake/projects/happy.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/happy.lua rename to jni/SDL2-2.0.4/premake/projects/happy.lua index b2764801..37839ae7 100755 --- a/jni/SDL2-2.0.3/premake/projects/happy.lua +++ b/jni/SDL2-2.0.4/premake/projects/happy.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/keyboard.lua b/jni/SDL2-2.0.4/premake/projects/keyboard.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/keyboard.lua rename to jni/SDL2-2.0.4/premake/projects/keyboard.lua index 6cd31d1b..22d6f8fb 100755 --- a/jni/SDL2-2.0.3/premake/projects/keyboard.lua +++ b/jni/SDL2-2.0.4/premake/projects/keyboard.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/loopwave.lua b/jni/SDL2-2.0.4/premake/projects/loopwave.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/loopwave.lua rename to jni/SDL2-2.0.4/premake/projects/loopwave.lua index 391dbdad..cf02865b 100755 --- a/jni/SDL2-2.0.3/premake/projects/loopwave.lua +++ b/jni/SDL2-2.0.4/premake/projects/loopwave.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/mixer.lua b/jni/SDL2-2.0.4/premake/projects/mixer.lua similarity index 94% rename from jni/SDL2-2.0.3/premake/projects/mixer.lua rename to jni/SDL2-2.0.4/premake/projects/mixer.lua index bfcd5e64..af571829 100755 --- a/jni/SDL2-2.0.3/premake/projects/mixer.lua +++ b/jni/SDL2-2.0.4/premake/projects/mixer.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/rectangles.lua b/jni/SDL2-2.0.4/premake/projects/rectangles.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/rectangles.lua rename to jni/SDL2-2.0.4/premake/projects/rectangles.lua index 071f8383..0721d32e 100755 --- a/jni/SDL2-2.0.3/premake/projects/rectangles.lua +++ b/jni/SDL2-2.0.4/premake/projects/rectangles.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testatomic.lua b/jni/SDL2-2.0.4/premake/projects/testatomic.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testatomic.lua rename to jni/SDL2-2.0.4/premake/projects/testatomic.lua index ecf5adb4..5b039b81 100755 --- a/jni/SDL2-2.0.3/premake/projects/testatomic.lua +++ b/jni/SDL2-2.0.4/premake/projects/testatomic.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testaudioinfo.lua b/jni/SDL2-2.0.4/premake/projects/testaudioinfo.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testaudioinfo.lua rename to jni/SDL2-2.0.4/premake/projects/testaudioinfo.lua index 9ee89f48..cee89424 100755 --- a/jni/SDL2-2.0.3/premake/projects/testaudioinfo.lua +++ b/jni/SDL2-2.0.4/premake/projects/testaudioinfo.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testautomation.lua b/jni/SDL2-2.0.4/premake/projects/testautomation.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testautomation.lua rename to jni/SDL2-2.0.4/premake/projects/testautomation.lua index 43e6dd83..ebaece77 100755 --- a/jni/SDL2-2.0.3/premake/projects/testautomation.lua +++ b/jni/SDL2-2.0.4/premake/projects/testautomation.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testdraw2.lua b/jni/SDL2-2.0.4/premake/projects/testdraw2.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testdraw2.lua rename to jni/SDL2-2.0.4/premake/projects/testdraw2.lua index 2431484f..29ab2909 100755 --- a/jni/SDL2-2.0.3/premake/projects/testdraw2.lua +++ b/jni/SDL2-2.0.4/premake/projects/testdraw2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testdrawchessboard.lua b/jni/SDL2-2.0.4/premake/projects/testdrawchessboard.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testdrawchessboard.lua rename to jni/SDL2-2.0.4/premake/projects/testdrawchessboard.lua index b074d7f4..90b8b654 100755 --- a/jni/SDL2-2.0.3/premake/projects/testdrawchessboard.lua +++ b/jni/SDL2-2.0.4/premake/projects/testdrawchessboard.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testerror.lua b/jni/SDL2-2.0.4/premake/projects/testerror.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testerror.lua rename to jni/SDL2-2.0.4/premake/projects/testerror.lua index 17b7638f..cfea1e1f 100755 --- a/jni/SDL2-2.0.3/premake/projects/testerror.lua +++ b/jni/SDL2-2.0.4/premake/projects/testerror.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testfile.lua b/jni/SDL2-2.0.4/premake/projects/testfile.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testfile.lua rename to jni/SDL2-2.0.4/premake/projects/testfile.lua index 8ed28188..6c53c047 100755 --- a/jni/SDL2-2.0.3/premake/projects/testfile.lua +++ b/jni/SDL2-2.0.4/premake/projects/testfile.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testfilesystem.lua b/jni/SDL2-2.0.4/premake/projects/testfilesystem.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/testfilesystem.lua rename to jni/SDL2-2.0.4/premake/projects/testfilesystem.lua index f135bbd4..f152c2e4 100755 --- a/jni/SDL2-2.0.3/premake/projects/testfilesystem.lua +++ b/jni/SDL2-2.0.4/premake/projects/testfilesystem.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testgamecontroller.lua b/jni/SDL2-2.0.4/premake/projects/testgamecontroller.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testgamecontroller.lua rename to jni/SDL2-2.0.4/premake/projects/testgamecontroller.lua index 322654f6..248f8f84 100755 --- a/jni/SDL2-2.0.3/premake/projects/testgamecontroller.lua +++ b/jni/SDL2-2.0.4/premake/projects/testgamecontroller.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testgesture.lua b/jni/SDL2-2.0.4/premake/projects/testgesture.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testgesture.lua rename to jni/SDL2-2.0.4/premake/projects/testgesture.lua index 2a8ca3dc..7d53d4bc 100755 --- a/jni/SDL2-2.0.3/premake/projects/testgesture.lua +++ b/jni/SDL2-2.0.4/premake/projects/testgesture.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testgl2.lua b/jni/SDL2-2.0.4/premake/projects/testgl2.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testgl2.lua rename to jni/SDL2-2.0.4/premake/projects/testgl2.lua index b2a4e64a..ba0bd257 100755 --- a/jni/SDL2-2.0.3/premake/projects/testgl2.lua +++ b/jni/SDL2-2.0.4/premake/projects/testgl2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testgles.lua b/jni/SDL2-2.0.4/premake/projects/testgles.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testgles.lua rename to jni/SDL2-2.0.4/premake/projects/testgles.lua index de180d47..a5794a41 100755 --- a/jni/SDL2-2.0.3/premake/projects/testgles.lua +++ b/jni/SDL2-2.0.4/premake/projects/testgles.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testhaptic.lua b/jni/SDL2-2.0.4/premake/projects/testhaptic.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testhaptic.lua rename to jni/SDL2-2.0.4/premake/projects/testhaptic.lua index a230f923..8d7d2ca9 100755 --- a/jni/SDL2-2.0.3/premake/projects/testhaptic.lua +++ b/jni/SDL2-2.0.4/premake/projects/testhaptic.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testiconv.lua b/jni/SDL2-2.0.4/premake/projects/testiconv.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testiconv.lua rename to jni/SDL2-2.0.4/premake/projects/testiconv.lua index db4ca57c..be13254f 100755 --- a/jni/SDL2-2.0.3/premake/projects/testiconv.lua +++ b/jni/SDL2-2.0.4/premake/projects/testiconv.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testime.lua b/jni/SDL2-2.0.4/premake/projects/testime.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testime.lua rename to jni/SDL2-2.0.4/premake/projects/testime.lua index dbcc7d18..5e026092 100755 --- a/jni/SDL2-2.0.3/premake/projects/testime.lua +++ b/jni/SDL2-2.0.4/premake/projects/testime.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testintersection.lua b/jni/SDL2-2.0.4/premake/projects/testintersection.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testintersection.lua rename to jni/SDL2-2.0.4/premake/projects/testintersection.lua index 0e910285..2252ea64 100755 --- a/jni/SDL2-2.0.3/premake/projects/testintersection.lua +++ b/jni/SDL2-2.0.4/premake/projects/testintersection.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testjoystick.lua b/jni/SDL2-2.0.4/premake/projects/testjoystick.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testjoystick.lua rename to jni/SDL2-2.0.4/premake/projects/testjoystick.lua index d6c6ca3c..c93efc84 100755 --- a/jni/SDL2-2.0.3/premake/projects/testjoystick.lua +++ b/jni/SDL2-2.0.4/premake/projects/testjoystick.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testkeys.lua b/jni/SDL2-2.0.4/premake/projects/testkeys.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testkeys.lua rename to jni/SDL2-2.0.4/premake/projects/testkeys.lua index 33753f2e..67175978 100755 --- a/jni/SDL2-2.0.3/premake/projects/testkeys.lua +++ b/jni/SDL2-2.0.4/premake/projects/testkeys.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testloadso.lua b/jni/SDL2-2.0.4/premake/projects/testloadso.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testloadso.lua rename to jni/SDL2-2.0.4/premake/projects/testloadso.lua index cc38996c..1ce3a069 100755 --- a/jni/SDL2-2.0.3/premake/projects/testloadso.lua +++ b/jni/SDL2-2.0.4/premake/projects/testloadso.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testlock.lua b/jni/SDL2-2.0.4/premake/projects/testlock.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testlock.lua rename to jni/SDL2-2.0.4/premake/projects/testlock.lua index 22afa3ef..0a7a9046 100755 --- a/jni/SDL2-2.0.3/premake/projects/testlock.lua +++ b/jni/SDL2-2.0.4/premake/projects/testlock.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testmessage.lua b/jni/SDL2-2.0.4/premake/projects/testmessage.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testmessage.lua rename to jni/SDL2-2.0.4/premake/projects/testmessage.lua index 4bcc976a..ac505fd4 100755 --- a/jni/SDL2-2.0.3/premake/projects/testmessage.lua +++ b/jni/SDL2-2.0.4/premake/projects/testmessage.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testmultiaudio.lua b/jni/SDL2-2.0.4/premake/projects/testmultiaudio.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testmultiaudio.lua rename to jni/SDL2-2.0.4/premake/projects/testmultiaudio.lua index ef7c86df..ed756cee 100755 --- a/jni/SDL2-2.0.3/premake/projects/testmultiaudio.lua +++ b/jni/SDL2-2.0.4/premake/projects/testmultiaudio.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testnative.lua b/jni/SDL2-2.0.4/premake/projects/testnative.lua similarity index 92% rename from jni/SDL2-2.0.3/premake/projects/testnative.lua rename to jni/SDL2-2.0.4/premake/projects/testnative.lua index b9b22d74..346bf88a 100755 --- a/jni/SDL2-2.0.3/premake/projects/testnative.lua +++ b/jni/SDL2-2.0.4/premake/projects/testnative.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testoverlay2.lua b/jni/SDL2-2.0.4/premake/projects/testoverlay2.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testoverlay2.lua rename to jni/SDL2-2.0.4/premake/projects/testoverlay2.lua index 00d1c4e2..c9ef4ab9 100755 --- a/jni/SDL2-2.0.3/premake/projects/testoverlay2.lua +++ b/jni/SDL2-2.0.4/premake/projects/testoverlay2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testplatform.lua b/jni/SDL2-2.0.4/premake/projects/testplatform.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testplatform.lua rename to jni/SDL2-2.0.4/premake/projects/testplatform.lua index 4715fd75..8fc2c316 100755 --- a/jni/SDL2-2.0.3/premake/projects/testplatform.lua +++ b/jni/SDL2-2.0.4/premake/projects/testplatform.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testpower.lua b/jni/SDL2-2.0.4/premake/projects/testpower.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testpower.lua rename to jni/SDL2-2.0.4/premake/projects/testpower.lua index 391f9503..45f07a9f 100755 --- a/jni/SDL2-2.0.3/premake/projects/testpower.lua +++ b/jni/SDL2-2.0.4/premake/projects/testpower.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testrelative.lua b/jni/SDL2-2.0.4/premake/projects/testrelative.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testrelative.lua rename to jni/SDL2-2.0.4/premake/projects/testrelative.lua index c72c5e1a..83f076c9 100755 --- a/jni/SDL2-2.0.3/premake/projects/testrelative.lua +++ b/jni/SDL2-2.0.4/premake/projects/testrelative.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testrendercopyex.lua b/jni/SDL2-2.0.4/premake/projects/testrendercopyex.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testrendercopyex.lua rename to jni/SDL2-2.0.4/premake/projects/testrendercopyex.lua index 768e7ff0..7717d6cc 100755 --- a/jni/SDL2-2.0.3/premake/projects/testrendercopyex.lua +++ b/jni/SDL2-2.0.4/premake/projects/testrendercopyex.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testrendertarget.lua b/jni/SDL2-2.0.4/premake/projects/testrendertarget.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testrendertarget.lua rename to jni/SDL2-2.0.4/premake/projects/testrendertarget.lua index 4a2968e4..605f99e0 100755 --- a/jni/SDL2-2.0.3/premake/projects/testrendertarget.lua +++ b/jni/SDL2-2.0.4/premake/projects/testrendertarget.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testresample.lua b/jni/SDL2-2.0.4/premake/projects/testresample.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testresample.lua rename to jni/SDL2-2.0.4/premake/projects/testresample.lua index beb379ce..25bbcd81 100755 --- a/jni/SDL2-2.0.3/premake/projects/testresample.lua +++ b/jni/SDL2-2.0.4/premake/projects/testresample.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testrumble.lua b/jni/SDL2-2.0.4/premake/projects/testrumble.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testrumble.lua rename to jni/SDL2-2.0.4/premake/projects/testrumble.lua index 30eecf7e..865a8324 100755 --- a/jni/SDL2-2.0.3/premake/projects/testrumble.lua +++ b/jni/SDL2-2.0.4/premake/projects/testrumble.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testscale.lua b/jni/SDL2-2.0.4/premake/projects/testscale.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testscale.lua rename to jni/SDL2-2.0.4/premake/projects/testscale.lua index 7508e5b1..09268749 100755 --- a/jni/SDL2-2.0.3/premake/projects/testscale.lua +++ b/jni/SDL2-2.0.4/premake/projects/testscale.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testsem.lua b/jni/SDL2-2.0.4/premake/projects/testsem.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testsem.lua rename to jni/SDL2-2.0.4/premake/projects/testsem.lua index b53a68ea..2f723c52 100755 --- a/jni/SDL2-2.0.3/premake/projects/testsem.lua +++ b/jni/SDL2-2.0.4/premake/projects/testsem.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testshader.lua b/jni/SDL2-2.0.4/premake/projects/testshader.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testshader.lua rename to jni/SDL2-2.0.4/premake/projects/testshader.lua index cda0baaa..9e0c92e4 100755 --- a/jni/SDL2-2.0.3/premake/projects/testshader.lua +++ b/jni/SDL2-2.0.4/premake/projects/testshader.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testshape.lua b/jni/SDL2-2.0.4/premake/projects/testshape.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testshape.lua rename to jni/SDL2-2.0.4/premake/projects/testshape.lua index b78de30a..fd57e674 100755 --- a/jni/SDL2-2.0.3/premake/projects/testshape.lua +++ b/jni/SDL2-2.0.4/premake/projects/testshape.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testsprite2.lua b/jni/SDL2-2.0.4/premake/projects/testsprite2.lua similarity index 91% rename from jni/SDL2-2.0.3/premake/projects/testsprite2.lua rename to jni/SDL2-2.0.4/premake/projects/testsprite2.lua index 5096f3f3..05bab7ce 100755 --- a/jni/SDL2-2.0.3/premake/projects/testsprite2.lua +++ b/jni/SDL2-2.0.4/premake/projects/testsprite2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testspriteminimal.lua b/jni/SDL2-2.0.4/premake/projects/testspriteminimal.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testspriteminimal.lua rename to jni/SDL2-2.0.4/premake/projects/testspriteminimal.lua index 847d8bb4..0a21e462 100755 --- a/jni/SDL2-2.0.3/premake/projects/testspriteminimal.lua +++ b/jni/SDL2-2.0.4/premake/projects/testspriteminimal.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/teststreaming.lua b/jni/SDL2-2.0.4/premake/projects/teststreaming.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/teststreaming.lua rename to jni/SDL2-2.0.4/premake/projects/teststreaming.lua index a3410134..99c77a06 100755 --- a/jni/SDL2-2.0.3/premake/projects/teststreaming.lua +++ b/jni/SDL2-2.0.4/premake/projects/teststreaming.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testthread.lua b/jni/SDL2-2.0.4/premake/projects/testthread.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testthread.lua rename to jni/SDL2-2.0.4/premake/projects/testthread.lua index f1404f99..59ae45d3 100755 --- a/jni/SDL2-2.0.3/premake/projects/testthread.lua +++ b/jni/SDL2-2.0.4/premake/projects/testthread.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testtimer.lua b/jni/SDL2-2.0.4/premake/projects/testtimer.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testtimer.lua rename to jni/SDL2-2.0.4/premake/projects/testtimer.lua index 039dff96..22d89a75 100755 --- a/jni/SDL2-2.0.3/premake/projects/testtimer.lua +++ b/jni/SDL2-2.0.4/premake/projects/testtimer.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testver.lua b/jni/SDL2-2.0.4/premake/projects/testver.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testver.lua rename to jni/SDL2-2.0.4/premake/projects/testver.lua index 70aba2dd..653d0e6e 100755 --- a/jni/SDL2-2.0.3/premake/projects/testver.lua +++ b/jni/SDL2-2.0.4/premake/projects/testver.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/testwm2.lua b/jni/SDL2-2.0.4/premake/projects/testwm2.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/testwm2.lua rename to jni/SDL2-2.0.4/premake/projects/testwm2.lua index 12e62457..502f7a11 100755 --- a/jni/SDL2-2.0.3/premake/projects/testwm2.lua +++ b/jni/SDL2-2.0.4/premake/projects/testwm2.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/torturethread.lua b/jni/SDL2-2.0.4/premake/projects/torturethread.lua similarity index 90% rename from jni/SDL2-2.0.3/premake/projects/torturethread.lua rename to jni/SDL2-2.0.4/premake/projects/torturethread.lua index eca1b044..bb7202a8 100755 --- a/jni/SDL2-2.0.3/premake/projects/torturethread.lua +++ b/jni/SDL2-2.0.4/premake/projects/torturethread.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/projects/touch.lua b/jni/SDL2-2.0.4/premake/projects/touch.lua similarity index 93% rename from jni/SDL2-2.0.3/premake/projects/touch.lua rename to jni/SDL2-2.0.4/premake/projects/touch.lua index da9f98dc..85c04282 100755 --- a/jni/SDL2-2.0.3/premake/projects/touch.lua +++ b/jni/SDL2-2.0.4/premake/projects/touch.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_check_compile.lua b/jni/SDL2-2.0.4/premake/util/sdl_check_compile.lua similarity index 99% rename from jni/SDL2-2.0.3/premake/util/sdl_check_compile.lua rename to jni/SDL2-2.0.4/premake/util/sdl_check_compile.lua index 668754a5..c3733355 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_check_compile.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_check_compile.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_dependency_checkers.lua b/jni/SDL2-2.0.4/premake/util/sdl_dependency_checkers.lua similarity index 96% rename from jni/SDL2-2.0.3/premake/util/sdl_dependency_checkers.lua rename to jni/SDL2-2.0.4/premake/util/sdl_dependency_checkers.lua index 2e8e7fcd..0ebbc2dd 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_dependency_checkers.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_dependency_checkers.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_depends.lua b/jni/SDL2-2.0.4/premake/util/sdl_depends.lua similarity index 97% rename from jni/SDL2-2.0.3/premake/util/sdl_depends.lua rename to jni/SDL2-2.0.4/premake/util/sdl_depends.lua index c7367971..af595436 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_depends.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_depends.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_file.lua b/jni/SDL2-2.0.4/premake/util/sdl_file.lua similarity index 95% rename from jni/SDL2-2.0.3/premake/util/sdl_file.lua rename to jni/SDL2-2.0.4/premake/util/sdl_file.lua index 74a15e57..2fe1b924 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_file.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_file.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_gen_config.lua b/jni/SDL2-2.0.4/premake/util/sdl_gen_config.lua similarity index 95% rename from jni/SDL2-2.0.3/premake/util/sdl_gen_config.lua rename to jni/SDL2-2.0.4/premake/util/sdl_gen_config.lua index 0e030c46..f0873e52 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_gen_config.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_gen_config.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_projects.lua b/jni/SDL2-2.0.4/premake/util/sdl_projects.lua similarity index 99% rename from jni/SDL2-2.0.3/premake/util/sdl_projects.lua rename to jni/SDL2-2.0.4/premake/util/sdl_projects.lua index ec26fbf3..6e94019f 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_projects.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_projects.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/premake/util/sdl_string.lua b/jni/SDL2-2.0.4/premake/util/sdl_string.lua similarity index 94% rename from jni/SDL2-2.0.3/premake/util/sdl_string.lua rename to jni/SDL2-2.0.4/premake/util/sdl_string.lua index aa3b5895..d2b9a583 100755 --- a/jni/SDL2-2.0.3/premake/util/sdl_string.lua +++ b/jni/SDL2-2.0.4/premake/util/sdl_string.lua @@ -1,4 +1,4 @@ --- Copyright (C) 1997-2015 Sam Lantinga +-- Copyright (C) 1997-2016 Sam Lantinga -- -- This software is provided 'as-is', without any express or implied -- warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/sdl2-config.in b/jni/SDL2-2.0.4/sdl2-config.in similarity index 100% rename from jni/SDL2-2.0.3/sdl2-config.in rename to jni/SDL2-2.0.4/sdl2-config.in diff --git a/jni/SDL2-2.0.3/sdl2.m4 b/jni/SDL2-2.0.4/sdl2.m4 similarity index 100% rename from jni/SDL2-2.0.3/sdl2.m4 rename to jni/SDL2-2.0.4/sdl2.m4 diff --git a/jni/SDL2-2.0.3/sdl2.pc.in b/jni/SDL2-2.0.4/sdl2.pc.in similarity index 100% rename from jni/SDL2-2.0.3/sdl2.pc.in rename to jni/SDL2-2.0.4/sdl2.pc.in diff --git a/jni/SDL2-2.0.3/src/SDL.c b/jni/SDL2-2.0.4/src/SDL.c similarity index 99% rename from jni/SDL2-2.0.3/src/SDL.c rename to jni/SDL2-2.0.4/src/SDL.c index 6318bbe6..5d310021 100644 --- a/jni/SDL2-2.0.3/src/SDL.c +++ b/jni/SDL2-2.0.4/src/SDL.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_assert.c b/jni/SDL2-2.0.4/src/SDL_assert.c similarity index 99% rename from jni/SDL2-2.0.3/src/SDL_assert.c rename to jni/SDL2-2.0.4/src/SDL_assert.c index e1d267a9..a21f70b6 100644 --- a/jni/SDL2-2.0.3/src/SDL_assert.c +++ b/jni/SDL2-2.0.4/src/SDL_assert.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_assert_c.h b/jni/SDL2-2.0.4/src/SDL_assert_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/SDL_assert_c.h rename to jni/SDL2-2.0.4/src/SDL_assert_c.h index 6f05c925..bc3b631e 100644 --- a/jni/SDL2-2.0.3/src/SDL_assert_c.h +++ b/jni/SDL2-2.0.4/src/SDL_assert_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_error.c b/jni/SDL2-2.0.4/src/SDL_error.c similarity index 99% rename from jni/SDL2-2.0.3/src/SDL_error.c rename to jni/SDL2-2.0.4/src/SDL_error.c index 79e9347a..ace5cc39 100644 --- a/jni/SDL2-2.0.3/src/SDL_error.c +++ b/jni/SDL2-2.0.4/src/SDL_error.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_error_c.h b/jni/SDL2-2.0.4/src/SDL_error_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/SDL_error_c.h rename to jni/SDL2-2.0.4/src/SDL_error_c.h index 946281d2..76ccf2b9 100644 --- a/jni/SDL2-2.0.3/src/SDL_error_c.h +++ b/jni/SDL2-2.0.4/src/SDL_error_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_hints.c b/jni/SDL2-2.0.4/src/SDL_hints.c similarity index 99% rename from jni/SDL2-2.0.3/src/SDL_hints.c rename to jni/SDL2-2.0.4/src/SDL_hints.c index 7026ac5d..04523327 100644 --- a/jni/SDL2-2.0.3/src/SDL_hints.c +++ b/jni/SDL2-2.0.4/src/SDL_hints.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_internal.h b/jni/SDL2-2.0.4/src/SDL_internal.h similarity index 95% rename from jni/SDL2-2.0.3/src/SDL_internal.h rename to jni/SDL2-2.0.4/src/SDL_internal.h index a3ccb363..7e928501 100644 --- a/jni/SDL2-2.0.3/src/SDL_internal.h +++ b/jni/SDL2-2.0.4/src/SDL_internal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/SDL_log.c b/jni/SDL2-2.0.4/src/SDL_log.c similarity index 99% rename from jni/SDL2-2.0.3/src/SDL_log.c rename to jni/SDL2-2.0.4/src/SDL_log.c index b5ab601e..60bac9f6 100644 --- a/jni/SDL2-2.0.3/src/SDL_log.c +++ b/jni/SDL2-2.0.4/src/SDL_log.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/atomic/SDL_atomic.c b/jni/SDL2-2.0.4/src/atomic/SDL_atomic.c similarity index 99% rename from jni/SDL2-2.0.3/src/atomic/SDL_atomic.c rename to jni/SDL2-2.0.4/src/atomic/SDL_atomic.c index 30b4ccca..db86d6ed 100644 --- a/jni/SDL2-2.0.3/src/atomic/SDL_atomic.c +++ b/jni/SDL2-2.0.4/src/atomic/SDL_atomic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/atomic/SDL_spinlock.c b/jni/SDL2-2.0.4/src/atomic/SDL_spinlock.c similarity index 98% rename from jni/SDL2-2.0.3/src/atomic/SDL_spinlock.c rename to jni/SDL2-2.0.4/src/atomic/SDL_spinlock.c index 1681aa78..f582afb4 100644 --- a/jni/SDL2-2.0.3/src/atomic/SDL_spinlock.c +++ b/jni/SDL2-2.0.4/src/atomic/SDL_spinlock.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audio.c b/jni/SDL2-2.0.4/src/audio/SDL_audio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_audio.c rename to jni/SDL2-2.0.4/src/audio/SDL_audio.c index 04f1e7ec..2ffd216c 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audio.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_audio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audio_c.h b/jni/SDL2-2.0.4/src/audio/SDL_audio_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/SDL_audio_c.h rename to jni/SDL2-2.0.4/src/audio/SDL_audio_c.h index b1fab65f..b03a9156 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audio_c.h +++ b/jni/SDL2-2.0.4/src/audio/SDL_audio_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audiocvt.c b/jni/SDL2-2.0.4/src/audio/SDL_audiocvt.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_audiocvt.c rename to jni/SDL2-2.0.4/src/audio/SDL_audiocvt.c index 092839b8..3b47c4cb 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audiocvt.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_audiocvt.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audiodev.c b/jni/SDL2-2.0.4/src/audio/SDL_audiodev.c similarity index 98% rename from jni/SDL2-2.0.3/src/audio/SDL_audiodev.c rename to jni/SDL2-2.0.4/src/audio/SDL_audiodev.c index dd89af74..5c392cfb 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audiodev.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_audiodev.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audiodev_c.h b/jni/SDL2-2.0.4/src/audio/SDL_audiodev_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/SDL_audiodev_c.h rename to jni/SDL2-2.0.4/src/audio/SDL_audiodev_c.h index 2208d9c4..fa60bcdb 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audiodev_c.h +++ b/jni/SDL2-2.0.4/src/audio/SDL_audiodev_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audiomem.h b/jni/SDL2-2.0.4/src/audio/SDL_audiomem.h similarity index 94% rename from jni/SDL2-2.0.3/src/audio/SDL_audiomem.h rename to jni/SDL2-2.0.4/src/audio/SDL_audiomem.h index a65b44b7..091d15c2 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audiomem.h +++ b/jni/SDL2-2.0.4/src/audio/SDL_audiomem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_audiotypecvt.c b/jni/SDL2-2.0.4/src/audio/SDL_audiotypecvt.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_audiotypecvt.c rename to jni/SDL2-2.0.4/src/audio/SDL_audiotypecvt.c index 1e3a6447..be3b7430 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_audiotypecvt.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_audiotypecvt.c @@ -1,7 +1,7 @@ /* DO NOT EDIT! This file is generated by sdlgenaudiocvt.pl */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_mixer.c b/jni/SDL2-2.0.4/src/audio/SDL_mixer.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_mixer.c rename to jni/SDL2-2.0.4/src/audio/SDL_mixer.c index 38fda0bf..b49c73da 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_mixer.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_mixer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_sysaudio.h b/jni/SDL2-2.0.4/src/audio/SDL_sysaudio.h similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_sysaudio.h rename to jni/SDL2-2.0.4/src/audio/SDL_sysaudio.h index c220f582..426a190f 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_sysaudio.h +++ b/jni/SDL2-2.0.4/src/audio/SDL_sysaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_wave.c b/jni/SDL2-2.0.4/src/audio/SDL_wave.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/SDL_wave.c rename to jni/SDL2-2.0.4/src/audio/SDL_wave.c index e898115c..99daac64 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_wave.c +++ b/jni/SDL2-2.0.4/src/audio/SDL_wave.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/SDL_wave.h b/jni/SDL2-2.0.4/src/audio/SDL_wave.h similarity index 97% rename from jni/SDL2-2.0.3/src/audio/SDL_wave.h rename to jni/SDL2-2.0.4/src/audio/SDL_wave.h index ccfa0448..f2f93986 100644 --- a/jni/SDL2-2.0.3/src/audio/SDL_wave.h +++ b/jni/SDL2-2.0.4/src/audio/SDL_wave.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.c b/jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.c rename to jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.c index fac51978..af952371 100644 --- a/jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.c +++ b/jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.h b/jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.h rename to jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.h index c5d3aeee..3080aea2 100644 --- a/jni/SDL2-2.0.3/src/audio/alsa/SDL_alsa_audio.h +++ b/jni/SDL2-2.0.4/src/audio/alsa/SDL_alsa_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.c b/jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.c similarity index 98% rename from jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.c rename to jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.c index f35878cd..4a4faadc 100644 --- a/jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.c +++ b/jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.h b/jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.h rename to jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.h index 38bb1905..639be9c0 100644 --- a/jni/SDL2-2.0.3/src/audio/android/SDL_androidaudio.h +++ b/jni/SDL2-2.0.4/src/audio/android/SDL_androidaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.c b/jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.c rename to jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.c index ca97c0af..5d40cd14 100644 --- a/jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.c +++ b/jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.h b/jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.h rename to jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.h index 54b86f6b..6b9bf303 100644 --- a/jni/SDL2-2.0.3/src/audio/arts/SDL_artsaudio.h +++ b/jni/SDL2-2.0.4/src/audio/arts/SDL_artsaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.c b/jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.c rename to jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.c index b684f9eb..eeb25737 100644 --- a/jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.c +++ b/jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.h b/jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.h rename to jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.h index 7eee944f..7fe141b1 100644 --- a/jni/SDL2-2.0.3/src/audio/bsd/SDL_bsdaudio.h +++ b/jni/SDL2-2.0.4/src/audio/bsd/SDL_bsdaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.c b/jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.c rename to jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.c index f75bc784..46b617dc 100644 --- a/jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.c +++ b/jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.h b/jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.h rename to jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.h index 119d2582..577f9fb3 100644 --- a/jni/SDL2-2.0.3/src/audio/coreaudio/SDL_coreaudio.h +++ b/jni/SDL2-2.0.4/src/audio/coreaudio/SDL_coreaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.c b/jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.c rename to jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.c index 10c32f83..065e163a 100644 --- a/jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.c +++ b/jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.h b/jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.h rename to jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.h index 718cbab3..0d5f6bd7 100644 --- a/jni/SDL2-2.0.3/src/audio/directsound/SDL_directsound.h +++ b/jni/SDL2-2.0.4/src/audio/directsound/SDL_directsound.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.c b/jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.c similarity index 98% rename from jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.c rename to jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.c index ef8bc0dc..28745f9d 100644 --- a/jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.c +++ b/jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.h b/jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.h rename to jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.h index 0c1af3a5..b5666f7f 100644 --- a/jni/SDL2-2.0.3/src/audio/disk/SDL_diskaudio.h +++ b/jni/SDL2-2.0.4/src/audio/disk/SDL_diskaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.c b/jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.c rename to jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.c index 678c74fe..17e029e1 100644 --- a/jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.c +++ b/jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.h b/jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.h rename to jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.h index 054c4d9a..0e4acfca 100644 --- a/jni/SDL2-2.0.3/src/audio/dsp/SDL_dspaudio.h +++ b/jni/SDL2-2.0.4/src/audio/dsp/SDL_dspaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.c b/jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.c similarity index 96% rename from jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.c rename to jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.c index ec9c40fa..107f0b07 100644 --- a/jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.c +++ b/jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.h b/jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.h rename to jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.h index 9415c122..b1f88b1c 100644 --- a/jni/SDL2-2.0.3/src/audio/dummy/SDL_dummyaudio.h +++ b/jni/SDL2-2.0.4/src/audio/dummy/SDL_dummyaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.c b/jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.c rename to jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.c index 906728cb..6a7882dc 100644 --- a/jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.c +++ b/jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.h b/jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.h rename to jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.h index ad8159ee..d362b16c 100644 --- a/jni/SDL2-2.0.3/src/audio/esd/SDL_esdaudio.h +++ b/jni/SDL2-2.0.4/src/audio/esd/SDL_esdaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.c b/jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.c rename to jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.c index 6bab5a78..b22a3e9a 100644 --- a/jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.c +++ b/jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.h b/jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.h rename to jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.h index aa2ae192..5cf8a200 100644 --- a/jni/SDL2-2.0.3/src/audio/fusionsound/SDL_fsaudio.h +++ b/jni/SDL2-2.0.4/src/audio/fusionsound/SDL_fsaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.cc b/jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.cc similarity index 99% rename from jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.cc rename to jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.cc index c4765e37..38f3b962 100644 --- a/jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.cc +++ b/jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.h b/jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.h rename to jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.h index 21418618..23e5a765 100644 --- a/jni/SDL2-2.0.3/src/audio/haiku/SDL_haikuaudio.h +++ b/jni/SDL2-2.0.4/src/audio/haiku/SDL_haikuaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.c b/jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.c similarity index 98% rename from jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.c rename to jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.c index 5c5b0bcf..2d1ee73e 100644 --- a/jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.c +++ b/jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.h b/jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.h rename to jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.h index c2636f0c..90ff5448 100644 --- a/jni/SDL2-2.0.3/src/audio/nacl/SDL_naclaudio.h +++ b/jni/SDL2-2.0.4/src/audio/nacl/SDL_naclaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.c b/jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.c rename to jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.c index 596ca752..9de5ff8b 100644 --- a/jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.c +++ b/jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.h b/jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.h rename to jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.h index 715f1fb2..2f46b0b6 100644 --- a/jni/SDL2-2.0.3/src/audio/nas/SDL_nasaudio.h +++ b/jni/SDL2-2.0.4/src/audio/nas/SDL_nasaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.c b/jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.c rename to jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.c index 79c71645..14c9701f 100644 --- a/jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.c +++ b/jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.h b/jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.h rename to jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.h index 2bcb706c..ebc8bb5b 100644 --- a/jni/SDL2-2.0.3/src/audio/paudio/SDL_paudio.h +++ b/jni/SDL2-2.0.4/src/audio/paudio/SDL_paudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.c b/jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.c rename to jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.c index 60b7993a..18d2947e 100644 --- a/jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.c +++ b/jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.h b/jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.h rename to jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.h index c6332744..6b266bd0 100644 --- a/jni/SDL2-2.0.3/src/audio/psp/SDL_pspaudio.h +++ b/jni/SDL2-2.0.4/src/audio/psp/SDL_pspaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.c b/jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.c rename to jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.c index 30ca984e..6b11e066 100644 --- a/jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.h b/jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.h rename to jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.h index 995c53c6..c57ab713 100644 --- a/jni/SDL2-2.0.3/src/audio/pulseaudio/SDL_pulseaudio.h +++ b/jni/SDL2-2.0.4/src/audio/pulseaudio/SDL_pulseaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.c b/jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.c rename to jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.c index 784466ca..1899ca6d 100644 --- a/jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.c +++ b/jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.h b/jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.h rename to jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.h index 363feb47..53d37e96 100644 --- a/jni/SDL2-2.0.3/src/audio/qsa/SDL_qsa_audio.h +++ b/jni/SDL2-2.0.4/src/audio/qsa/SDL_qsa_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/sdlgenaudiocvt.pl b/jni/SDL2-2.0.4/src/audio/sdlgenaudiocvt.pl similarity index 99% rename from jni/SDL2-2.0.3/src/audio/sdlgenaudiocvt.pl rename to jni/SDL2-2.0.4/src/audio/sdlgenaudiocvt.pl index b012df80..c53f1c35 100755 --- a/jni/SDL2-2.0.3/src/audio/sdlgenaudiocvt.pl +++ b/jni/SDL2-2.0.4/src/audio/sdlgenaudiocvt.pl @@ -38,7 +38,7 @@ sub outputHeader { /* DO NOT EDIT! This file is generated by sdlgenaudiocvt.pl */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.c b/jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.c rename to jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.c index ba4fc4fa..64565ae8 100644 --- a/jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.c +++ b/jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.h b/jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.h similarity index 95% rename from jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.h rename to jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.h index 6956674b..1e748ac9 100644 --- a/jni/SDL2-2.0.3/src/audio/sndio/SDL_sndioaudio.h +++ b/jni/SDL2-2.0.4/src/audio/sndio/SDL_sndioaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.c b/jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.c rename to jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.c index 9cdefbdb..71029d21 100644 --- a/jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.c +++ b/jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.h b/jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.h rename to jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.h index 02ac6cbd..ecced0f5 100644 --- a/jni/SDL2-2.0.3/src/audio/sun/SDL_sunaudio.h +++ b/jni/SDL2-2.0.4/src/audio/sun/SDL_sunaudio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.c b/jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.c similarity index 99% rename from jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.c rename to jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.c index 37debb90..6d05a65e 100644 --- a/jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.c +++ b/jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.h b/jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.h similarity index 96% rename from jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.h rename to jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.h index a0dec010..401db398 100644 --- a/jni/SDL2-2.0.3/src/audio/winmm/SDL_winmm.h +++ b/jni/SDL2-2.0.4/src/audio/winmm/SDL_winmm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2.c b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2.c similarity index 97% rename from jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2.c rename to jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2.c index ec1967a8..dff234b4 100644 --- a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2.c +++ b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -66,14 +66,11 @@ in the Windows SDK, v.10.0.10240.0 (Win 10's initial SDK) */ #else -/* XAudio2 exists as of the March 2008 DirectX SDK - The XAudio2 implementation available in the Windows 8 SDK targets Windows 8 and newer. - If you want to build SDL with XAudio2 support you should install the DirectX SDK. +/* XAudio2 exists in the last DirectX SDK as well as the latest Windows SDK. + To enable XAudio2 support, you will need to add the location of your DirectX SDK headers to + the SDL projects additional include directories and then set SDL_XAUDIO2_HAS_SDK=1 as a + preprocessor define */ -/* Disable compiling in the XAudio2 support pending fixes to dynamically load the XAudio2 - entry points so we can be robust to user configuration. Also needs to be fixed to build - with the Windows 10 SDK. -*/ #if 0 /* See comment above */ #include #if (!defined(_DXSDK_BUILD_MAJOR) || (_DXSDK_BUILD_MAJOR < 1284)) diff --git a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp rename to jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp index e4fb8e84..b2d67c7f 100644 --- a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp +++ b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h similarity index 97% rename from jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h rename to jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h index 6f14f17a..aa6486f9 100644 --- a/jni/SDL2-2.0.3/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h +++ b/jni/SDL2-2.0.4/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/android/SDL_android.c b/jni/SDL2-2.0.4/src/core/android/SDL_android.c similarity index 99% rename from jni/SDL2-2.0.3/src/core/android/SDL_android.c rename to jni/SDL2-2.0.4/src/core/android/SDL_android.c index be948d22..f6e0a833 100644 --- a/jni/SDL2-2.0.3/src/core/android/SDL_android.c +++ b/jni/SDL2-2.0.4/src/core/android/SDL_android.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/android/SDL_android.h b/jni/SDL2-2.0.4/src/core/android/SDL_android.h similarity index 98% rename from jni/SDL2-2.0.3/src/core/android/SDL_android.h rename to jni/SDL2-2.0.4/src/core/android/SDL_android.h index 758e3023..8e2ab93c 100644 --- a/jni/SDL2-2.0.3/src/core/android/SDL_android.h +++ b/jni/SDL2-2.0.4/src/core/android/SDL_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_dbus.c b/jni/SDL2-2.0.4/src/core/linux/SDL_dbus.c similarity index 99% rename from jni/SDL2-2.0.3/src/core/linux/SDL_dbus.c rename to jni/SDL2-2.0.4/src/core/linux/SDL_dbus.c index cc7b3d37..5d0df050 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_dbus.c +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_dbus.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_dbus.h b/jni/SDL2-2.0.4/src/core/linux/SDL_dbus.h similarity index 98% rename from jni/SDL2-2.0.3/src/core/linux/SDL_dbus.h rename to jni/SDL2-2.0.4/src/core/linux/SDL_dbus.h index dcfec77e..c064381a 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_dbus.h +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_dbus.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_evdev.c b/jni/SDL2-2.0.4/src/core/linux/SDL_evdev.c similarity index 99% rename from jni/SDL2-2.0.3/src/core/linux/SDL_evdev.c rename to jni/SDL2-2.0.4/src/core/linux/SDL_evdev.c index b9246745..a8f2b138 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_evdev.c +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_evdev.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_evdev.h b/jni/SDL2-2.0.4/src/core/linux/SDL_evdev.h similarity index 96% rename from jni/SDL2-2.0.3/src/core/linux/SDL_evdev.h rename to jni/SDL2-2.0.4/src/core/linux/SDL_evdev.h index 670a5cb2..989ced85 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_evdev.h +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_evdev.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_ibus.c b/jni/SDL2-2.0.4/src/core/linux/SDL_ibus.c similarity index 99% rename from jni/SDL2-2.0.3/src/core/linux/SDL_ibus.c rename to jni/SDL2-2.0.4/src/core/linux/SDL_ibus.c index 46d602af..c9804c90 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_ibus.c +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_ibus.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_ibus.h b/jni/SDL2-2.0.4/src/core/linux/SDL_ibus.h similarity index 97% rename from jni/SDL2-2.0.3/src/core/linux/SDL_ibus.h rename to jni/SDL2-2.0.4/src/core/linux/SDL_ibus.h index 24765223..5ee7a8e4 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_ibus.h +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_ibus.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_udev.c b/jni/SDL2-2.0.4/src/core/linux/SDL_udev.c similarity index 99% rename from jni/SDL2-2.0.3/src/core/linux/SDL_udev.c rename to jni/SDL2-2.0.4/src/core/linux/SDL_udev.c index cf66331e..099cc435 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_udev.c +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_udev.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/linux/SDL_udev.h b/jni/SDL2-2.0.4/src/core/linux/SDL_udev.h similarity index 98% rename from jni/SDL2-2.0.3/src/core/linux/SDL_udev.h rename to jni/SDL2-2.0.4/src/core/linux/SDL_udev.h index 9242870c..2e4434e6 100644 --- a/jni/SDL2-2.0.3/src/core/linux/SDL_udev.h +++ b/jni/SDL2-2.0.4/src/core/linux/SDL_udev.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/windows/SDL_directx.h b/jni/SDL2-2.0.4/src/core/windows/SDL_directx.h similarity index 98% rename from jni/SDL2-2.0.3/src/core/windows/SDL_directx.h rename to jni/SDL2-2.0.4/src/core/windows/SDL_directx.h index 10692643..0533f61e 100644 --- a/jni/SDL2-2.0.3/src/core/windows/SDL_directx.h +++ b/jni/SDL2-2.0.4/src/core/windows/SDL_directx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/windows/SDL_windows.c b/jni/SDL2-2.0.4/src/core/windows/SDL_windows.c similarity index 98% rename from jni/SDL2-2.0.3/src/core/windows/SDL_windows.c rename to jni/SDL2-2.0.4/src/core/windows/SDL_windows.c index aff6e6d2..bc4afe0a 100644 --- a/jni/SDL2-2.0.3/src/core/windows/SDL_windows.c +++ b/jni/SDL2-2.0.4/src/core/windows/SDL_windows.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/windows/SDL_windows.h b/jni/SDL2-2.0.4/src/core/windows/SDL_windows.h similarity index 97% rename from jni/SDL2-2.0.3/src/core/windows/SDL_windows.h rename to jni/SDL2-2.0.4/src/core/windows/SDL_windows.h index 863971b6..0c99b03d 100644 --- a/jni/SDL2-2.0.3/src/core/windows/SDL_windows.h +++ b/jni/SDL2-2.0.4/src/core/windows/SDL_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/windows/SDL_xinput.c b/jni/SDL2-2.0.4/src/core/windows/SDL_xinput.c similarity index 98% rename from jni/SDL2-2.0.3/src/core/windows/SDL_xinput.c rename to jni/SDL2-2.0.4/src/core/windows/SDL_xinput.c index 1e13faea..355cd834 100644 --- a/jni/SDL2-2.0.3/src/core/windows/SDL_xinput.c +++ b/jni/SDL2-2.0.4/src/core/windows/SDL_xinput.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/windows/SDL_xinput.h b/jni/SDL2-2.0.4/src/core/windows/SDL_xinput.h similarity index 98% rename from jni/SDL2-2.0.3/src/core/windows/SDL_xinput.h rename to jni/SDL2-2.0.4/src/core/windows/SDL_xinput.h index c22b1ebe..67f8fdc1 100644 --- a/jni/SDL2-2.0.3/src/core/windows/SDL_xinput.h +++ b/jni/SDL2-2.0.4/src/core/windows/SDL_xinput.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.cpp b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.cpp similarity index 95% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.cpp rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.cpp index c8ac4813..265aa942 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.cpp +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.h b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.h similarity index 95% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.h rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.h index e905139c..e87a0b6b 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_common.h +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_common.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.cpp b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.cpp similarity index 95% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.cpp rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.cpp index df650cd8..5ab2ef9a 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.cpp +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -218,7 +218,14 @@ WINRT_ProcessWindowSizeChange() // TODO: Pass an SDL_Window-identifying thing in } #endif - WINRT_UpdateWindowFlags(window, SDL_WINDOW_MAXIMIZED | SDL_WINDOW_FULLSCREEN_DESKTOP); + const Uint32 latestFlags = WINRT_DetectWindowFlags(window); + if (latestFlags & SDL_WINDOW_MAXIMIZED) { + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); + } else { + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0); + } + + WINRT_UpdateWindowFlags(window, SDL_WINDOW_FULLSCREEN_DESKTOP); /* The window can move during a resize event, such as when maximizing or resizing from a corner */ @@ -364,7 +371,10 @@ void SDL_WinRTApp::SetWindow(CoreWindow^ window) window->CharacterReceived += ref new TypedEventHandler(this, &SDL_WinRTApp::OnCharacterReceived); -#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +#if NTDDI_VERSION >= NTDDI_WIN10 + Windows::UI::Core::SystemNavigationManager::GetForCurrentView()->BackRequested += + ref new EventHandler(this, &SDL_WinRTApp::OnBackButtonPressed); +#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP HardwareButtons::BackPressed += ref new EventHandler(this, &SDL_WinRTApp::OnBackButtonPressed); #endif @@ -618,6 +628,15 @@ void SDL_WinRTApp::OnWindowActivated(CoreWindow^ sender, WindowActivatedEventArg // * FIXME: Update keyboard state // */ //WIN_CheckClipboardUpdate(data->videodata); + + // HACK: Resetting the mouse-cursor here seems to fix + // https://bugzilla.libsdl.org/show_bug.cgi?id=3217, whereby a + // WinRT app's mouse cursor may switch to Windows' 'wait' cursor, + // after a user alt-tabs back into a full-screened SDL app. + // This bug does not appear to reproduce 100% of the time. + // It may be a bug in Windows itself (v.10.0.586.36, as tested, + // and the most-recent as of this writing). + SDL_SetCursor(NULL); } else { if (SDL_GetKeyboardFocus() == window) { SDL_SetKeyboardFocus(NULL); @@ -785,8 +804,8 @@ void SDL_WinRTApp::OnCharacterReceived(Windows::UI::Core::CoreWindow^ sender, Wi WINRT_ProcessCharacterReceivedEvent(args); } -#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP -void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args) +template +static void WINRT_OnBackButtonPressed(BackButtonEventArgs ^ args) { SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_AC_BACK); SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_AC_BACK); @@ -798,5 +817,18 @@ void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone: } } } + +#if NTDDI_VERSION == NTDDI_WIN10 +void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args) + +{ + WINRT_OnBackButtonPressed(args); +} +#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args) + +{ + WINRT_OnBackButtonPressed(args); +} #endif diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.h b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.h similarity index 94% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.h rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.h index 90fb7026..0b69c2bb 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_direct3d.h +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_direct3d.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -74,7 +74,9 @@ protected: void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args); void OnCharacterReceived(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CharacterReceivedEventArgs^ args); -#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP +#if NTDDI_VERSION >= NTDDI_WIN10 + void OnBackButtonPressed(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args); +#elif WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args); #endif diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.cpp b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.cpp rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.cpp index 9f943309..201e3b6c 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.cpp +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.h b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.h similarity index 95% rename from jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.h rename to jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.h index 7537710e..a08b67c4 100644 --- a/jni/SDL2-2.0.3/src/core/winrt/SDL_winrtapp_xaml.h +++ b/jni/SDL2-2.0.4/src/core/winrt/SDL_winrtapp_xaml.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/cpuinfo/SDL_cpuinfo.c b/jni/SDL2-2.0.4/src/cpuinfo/SDL_cpuinfo.c similarity index 99% rename from jni/SDL2-2.0.3/src/cpuinfo/SDL_cpuinfo.c rename to jni/SDL2-2.0.4/src/cpuinfo/SDL_cpuinfo.c index ed839ccc..c4c55be3 100644 --- a/jni/SDL2-2.0.3/src/cpuinfo/SDL_cpuinfo.c +++ b/jni/SDL2-2.0.4/src/cpuinfo/SDL_cpuinfo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -735,7 +735,7 @@ SDL_GetSystemRAM(void) #endif #ifdef HAVE_SYSCTLBYNAME if (SDL_SystemRAM <= 0) { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) #ifdef HW_REALMEM int mib[2] = {CTL_HW, HW_REALMEM}; #else diff --git a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.c b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.c similarity index 99% rename from jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.c rename to jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.c index 02e5c787..1411f8c9 100644 --- a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.c +++ b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.h b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.h similarity index 97% rename from jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.h rename to jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.h index fa9a0c7f..5faac219 100644 --- a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi.h +++ b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_overrides.h b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_overrides.h similarity index 99% rename from jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_overrides.h rename to jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_overrides.h index 75f31ced..c9ebfffe 100644 --- a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_overrides.h +++ b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_overrides.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_procs.h b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_procs.h similarity index 99% rename from jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_procs.h rename to jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_procs.h index 57bbba6d..3f11a25f 100644 --- a/jni/SDL2-2.0.3/src/dynapi/SDL_dynapi_procs.h +++ b/jni/SDL2-2.0.4/src/dynapi/SDL_dynapi_procs.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/dynapi/gendynapi.pl b/jni/SDL2-2.0.4/src/dynapi/gendynapi.pl similarity index 98% rename from jni/SDL2-2.0.3/src/dynapi/gendynapi.pl rename to jni/SDL2-2.0.4/src/dynapi/gendynapi.pl index 192889fd..5c3d7960 100755 --- a/jni/SDL2-2.0.3/src/dynapi/gendynapi.pl +++ b/jni/SDL2-2.0.4/src/dynapi/gendynapi.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Simple DirectMedia Layer -# Copyright (C) 1997-2015 Sam Lantinga +# Copyright (C) 1997-2016 Sam Lantinga # # This software is provided 'as-is', without any express or implied # warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_clipboardevents.c b/jni/SDL2-2.0.4/src/events/SDL_clipboardevents.c similarity index 95% rename from jni/SDL2-2.0.3/src/events/SDL_clipboardevents.c rename to jni/SDL2-2.0.4/src/events/SDL_clipboardevents.c index 5df8aa1c..9b2209bd 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_clipboardevents.c +++ b/jni/SDL2-2.0.4/src/events/SDL_clipboardevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_clipboardevents_c.h b/jni/SDL2-2.0.4/src/events/SDL_clipboardevents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/events/SDL_clipboardevents_c.h rename to jni/SDL2-2.0.4/src/events/SDL_clipboardevents_c.h index 6c58ee43..98e6a38b 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_clipboardevents_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_clipboardevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_dropevents.c b/jni/SDL2-2.0.4/src/events/SDL_dropevents.c similarity index 95% rename from jni/SDL2-2.0.3/src/events/SDL_dropevents.c rename to jni/SDL2-2.0.4/src/events/SDL_dropevents.c index 0c8c7bea..8f4405ef 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_dropevents.c +++ b/jni/SDL2-2.0.4/src/events/SDL_dropevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_dropevents_c.h b/jni/SDL2-2.0.4/src/events/SDL_dropevents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/events/SDL_dropevents_c.h rename to jni/SDL2-2.0.4/src/events/SDL_dropevents_c.h index 3e8615e8..a60e089f 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_dropevents_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_dropevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_events.c b/jni/SDL2-2.0.4/src/events/SDL_events.c similarity index 99% rename from jni/SDL2-2.0.3/src/events/SDL_events.c rename to jni/SDL2-2.0.4/src/events/SDL_events.c index 513cb55e..ffd10382 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_events.c +++ b/jni/SDL2-2.0.4/src/events/SDL_events.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_events_c.h b/jni/SDL2-2.0.4/src/events/SDL_events_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/events/SDL_events_c.h rename to jni/SDL2-2.0.4/src/events/SDL_events_c.h index 0ead5f30..2e331904 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_events_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_events_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_gesture.c b/jni/SDL2-2.0.4/src/events/SDL_gesture.c similarity index 99% rename from jni/SDL2-2.0.3/src/events/SDL_gesture.c rename to jni/SDL2-2.0.4/src/events/SDL_gesture.c index b7980ede..66def442 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_gesture.c +++ b/jni/SDL2-2.0.4/src/events/SDL_gesture.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_gesture_c.h b/jni/SDL2-2.0.4/src/events/SDL_gesture_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/events/SDL_gesture_c.h rename to jni/SDL2-2.0.4/src/events/SDL_gesture_c.h index f94dc715..3ff542cb 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_gesture_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_gesture_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_keyboard.c b/jni/SDL2-2.0.4/src/events/SDL_keyboard.c similarity index 98% rename from jni/SDL2-2.0.3/src/events/SDL_keyboard.c rename to jni/SDL2-2.0.4/src/events/SDL_keyboard.c index d4dc0e7b..15726545 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_keyboard.c +++ b/jni/SDL2-2.0.4/src/events/SDL_keyboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -845,6 +845,19 @@ SDL_SetModState(SDL_Keymod modstate) keyboard->modstate = modstate; } +/* Note that SDL_ToggleModState() is not a public API. SDL_SetModState() is. */ +void +SDL_ToggleModState(const SDL_Keymod modstate, const SDL_bool toggle) +{ + SDL_Keyboard *keyboard = &SDL_keyboard; + if (toggle) { + keyboard->modstate |= modstate; + } else { + keyboard->modstate &= ~modstate; + } +} + + SDL_Keycode SDL_GetKeyFromScancode(SDL_Scancode scancode) { diff --git a/jni/SDL2-2.0.3/src/events/SDL_keyboard_c.h b/jni/SDL2-2.0.4/src/events/SDL_keyboard_c.h similarity index 92% rename from jni/SDL2-2.0.3/src/events/SDL_keyboard_c.h rename to jni/SDL2-2.0.4/src/events/SDL_keyboard_c.h index 50fb06da..b4d1c073 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_keyboard_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_keyboard_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -62,6 +62,9 @@ extern void SDL_KeyboardQuit(void); /* Convert to UTF-8 */ extern char *SDL_UCS4ToUTF8(Uint32 ch, char *dst); +/* Toggle on or off pieces of the keyboard mod state. */ +extern void SDL_ToggleModState(const SDL_Keymod modstate, const SDL_bool toggle); + #endif /* _SDL_keyboard_c_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/jni/SDL2-2.0.3/src/events/SDL_mouse.c b/jni/SDL2-2.0.4/src/events/SDL_mouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/events/SDL_mouse.c rename to jni/SDL2-2.0.4/src/events/SDL_mouse.c index 716384a1..7793de87 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_mouse.c +++ b/jni/SDL2-2.0.4/src/events/SDL_mouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_mouse_c.h b/jni/SDL2-2.0.4/src/events/SDL_mouse_c.h similarity index 98% rename from jni/SDL2-2.0.3/src/events/SDL_mouse_c.h rename to jni/SDL2-2.0.4/src/events/SDL_mouse_c.h index b12bec35..03aca0a5 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_mouse_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_mouse_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_quit.c b/jni/SDL2-2.0.4/src/events/SDL_quit.c similarity index 98% rename from jni/SDL2-2.0.3/src/events/SDL_quit.c rename to jni/SDL2-2.0.4/src/events/SDL_quit.c index d2b215bc..5b7105ef 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_quit.c +++ b/jni/SDL2-2.0.4/src/events/SDL_quit.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_sysevents.h b/jni/SDL2-2.0.4/src/events/SDL_sysevents.h similarity index 95% rename from jni/SDL2-2.0.3/src/events/SDL_sysevents.h rename to jni/SDL2-2.0.4/src/events/SDL_sysevents.h index f1d460d8..c4ce0876 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_sysevents.h +++ b/jni/SDL2-2.0.4/src/events/SDL_sysevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_touch.c b/jni/SDL2-2.0.4/src/events/SDL_touch.c similarity index 99% rename from jni/SDL2-2.0.3/src/events/SDL_touch.c rename to jni/SDL2-2.0.4/src/events/SDL_touch.c index 1b477ea7..c73827c9 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_touch.c +++ b/jni/SDL2-2.0.4/src/events/SDL_touch.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_touch_c.h b/jni/SDL2-2.0.4/src/events/SDL_touch_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/events/SDL_touch_c.h rename to jni/SDL2-2.0.4/src/events/SDL_touch_c.h index 3e4b8bbf..d025df6e 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_touch_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_touch_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/SDL_windowevents.c b/jni/SDL2-2.0.4/src/events/SDL_windowevents.c similarity index 97% rename from jni/SDL2-2.0.3/src/events/SDL_windowevents.c rename to jni/SDL2-2.0.4/src/events/SDL_windowevents.c index 0e480f27..785ea4e0 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_windowevents.c +++ b/jni/SDL2-2.0.4/src/events/SDL_windowevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -127,6 +127,7 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1, if (window->flags & SDL_WINDOW_MINIMIZED) { return 0; } + window->flags &= ~SDL_WINDOW_MAXIMIZED; window->flags |= SDL_WINDOW_MINIMIZED; SDL_OnWindowMinimized(window); break; @@ -134,6 +135,7 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1, if (window->flags & SDL_WINDOW_MAXIMIZED) { return 0; } + window->flags &= ~SDL_WINDOW_MINIMIZED; window->flags |= SDL_WINDOW_MAXIMIZED; break; case SDL_WINDOWEVENT_RESTORED: diff --git a/jni/SDL2-2.0.3/src/events/SDL_windowevents_c.h b/jni/SDL2-2.0.4/src/events/SDL_windowevents_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/events/SDL_windowevents_c.h rename to jni/SDL2-2.0.4/src/events/SDL_windowevents_c.h index 140b38c3..2a6a4c05 100644 --- a/jni/SDL2-2.0.3/src/events/SDL_windowevents_c.h +++ b/jni/SDL2-2.0.4/src/events/SDL_windowevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/blank_cursor.h b/jni/SDL2-2.0.4/src/events/blank_cursor.h similarity index 95% rename from jni/SDL2-2.0.3/src/events/blank_cursor.h rename to jni/SDL2-2.0.4/src/events/blank_cursor.h index 17501293..5e15852c 100644 --- a/jni/SDL2-2.0.3/src/events/blank_cursor.h +++ b/jni/SDL2-2.0.4/src/events/blank_cursor.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/default_cursor.h b/jni/SDL2-2.0.4/src/events/default_cursor.h similarity index 97% rename from jni/SDL2-2.0.3/src/events/default_cursor.h rename to jni/SDL2-2.0.4/src/events/default_cursor.h index e292cbf5..297dd2dc 100644 --- a/jni/SDL2-2.0.3/src/events/default_cursor.h +++ b/jni/SDL2-2.0.4/src/events/default_cursor.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/scancodes_darwin.h b/jni/SDL2-2.0.4/src/events/scancodes_darwin.h similarity index 99% rename from jni/SDL2-2.0.3/src/events/scancodes_darwin.h rename to jni/SDL2-2.0.4/src/events/scancodes_darwin.h index 5677a894..26922530 100644 --- a/jni/SDL2-2.0.3/src/events/scancodes_darwin.h +++ b/jni/SDL2-2.0.4/src/events/scancodes_darwin.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/scancodes_linux.h b/jni/SDL2-2.0.4/src/events/scancodes_linux.h similarity index 99% rename from jni/SDL2-2.0.3/src/events/scancodes_linux.h rename to jni/SDL2-2.0.4/src/events/scancodes_linux.h index 532a2a98..8db37df5 100644 --- a/jni/SDL2-2.0.3/src/events/scancodes_linux.h +++ b/jni/SDL2-2.0.4/src/events/scancodes_linux.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/scancodes_windows.h b/jni/SDL2-2.0.4/src/events/scancodes_windows.h similarity index 98% rename from jni/SDL2-2.0.3/src/events/scancodes_windows.h rename to jni/SDL2-2.0.4/src/events/scancodes_windows.h index f712d5a0..b23a261e 100644 --- a/jni/SDL2-2.0.3/src/events/scancodes_windows.h +++ b/jni/SDL2-2.0.4/src/events/scancodes_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/events/scancodes_xfree86.h b/jni/SDL2-2.0.4/src/events/scancodes_xfree86.h similarity index 99% rename from jni/SDL2-2.0.3/src/events/scancodes_xfree86.h rename to jni/SDL2-2.0.4/src/events/scancodes_xfree86.h index e6155525..29d9ef94 100644 --- a/jni/SDL2-2.0.3/src/events/scancodes_xfree86.h +++ b/jni/SDL2-2.0.4/src/events/scancodes_xfree86.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/file/SDL_rwops.c b/jni/SDL2-2.0.4/src/file/SDL_rwops.c similarity index 99% rename from jni/SDL2-2.0.3/src/file/SDL_rwops.c rename to jni/SDL2-2.0.4/src/file/SDL_rwops.c index b3b445d2..38beb628 100644 --- a/jni/SDL2-2.0.3/src/file/SDL_rwops.c +++ b/jni/SDL2-2.0.4/src/file/SDL_rwops.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.h b/jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.h similarity index 94% rename from jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.h rename to jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.h index 387428f3..2c63f1da 100644 --- a/jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.h +++ b/jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.m b/jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.m similarity index 97% rename from jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.m rename to jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.m index 1d665edb..3385d3aa 100644 --- a/jni/SDL2-2.0.3/src/file/cocoa/SDL_rwopsbundlesupport.m +++ b/jni/SDL2-2.0.4/src/file/cocoa/SDL_rwopsbundlesupport.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/android/SDL_sysfilesystem.c b/jni/SDL2-2.0.4/src/filesystem/android/SDL_sysfilesystem.c similarity index 96% rename from jni/SDL2-2.0.3/src/filesystem/android/SDL_sysfilesystem.c rename to jni/SDL2-2.0.4/src/filesystem/android/SDL_sysfilesystem.c index 0401773e..3bdf9966 100644 --- a/jni/SDL2-2.0.3/src/filesystem/android/SDL_sysfilesystem.c +++ b/jni/SDL2-2.0.4/src/filesystem/android/SDL_sysfilesystem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/cocoa/SDL_sysfilesystem.m b/jni/SDL2-2.0.4/src/filesystem/cocoa/SDL_sysfilesystem.m similarity index 98% rename from jni/SDL2-2.0.3/src/filesystem/cocoa/SDL_sysfilesystem.m rename to jni/SDL2-2.0.4/src/filesystem/cocoa/SDL_sysfilesystem.m index 1e6a2067..6dee5805 100644 --- a/jni/SDL2-2.0.3/src/filesystem/cocoa/SDL_sysfilesystem.m +++ b/jni/SDL2-2.0.4/src/filesystem/cocoa/SDL_sysfilesystem.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/dummy/SDL_sysfilesystem.c b/jni/SDL2-2.0.4/src/filesystem/dummy/SDL_sysfilesystem.c similarity index 95% rename from jni/SDL2-2.0.3/src/filesystem/dummy/SDL_sysfilesystem.c rename to jni/SDL2-2.0.4/src/filesystem/dummy/SDL_sysfilesystem.c index 2cb9e21e..45273f24 100644 --- a/jni/SDL2-2.0.3/src/filesystem/dummy/SDL_sysfilesystem.c +++ b/jni/SDL2-2.0.4/src/filesystem/dummy/SDL_sysfilesystem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/haiku/SDL_sysfilesystem.cc b/jni/SDL2-2.0.4/src/filesystem/haiku/SDL_sysfilesystem.cc similarity index 97% rename from jni/SDL2-2.0.3/src/filesystem/haiku/SDL_sysfilesystem.cc rename to jni/SDL2-2.0.4/src/filesystem/haiku/SDL_sysfilesystem.cc index 3a0ea348..03489168 100644 --- a/jni/SDL2-2.0.3/src/filesystem/haiku/SDL_sysfilesystem.cc +++ b/jni/SDL2-2.0.4/src/filesystem/haiku/SDL_sysfilesystem.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/nacl/SDL_sysfilesystem.c b/jni/SDL2-2.0.4/src/filesystem/nacl/SDL_sysfilesystem.c similarity index 95% rename from jni/SDL2-2.0.3/src/filesystem/nacl/SDL_sysfilesystem.c rename to jni/SDL2-2.0.4/src/filesystem/nacl/SDL_sysfilesystem.c index 4efda46e..ac8fef1e 100644 --- a/jni/SDL2-2.0.3/src/filesystem/nacl/SDL_sysfilesystem.c +++ b/jni/SDL2-2.0.4/src/filesystem/nacl/SDL_sysfilesystem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/unix/SDL_sysfilesystem.c b/jni/SDL2-2.0.4/src/filesystem/unix/SDL_sysfilesystem.c similarity index 99% rename from jni/SDL2-2.0.3/src/filesystem/unix/SDL_sysfilesystem.c rename to jni/SDL2-2.0.4/src/filesystem/unix/SDL_sysfilesystem.c index b3264949..fa034a45 100644 --- a/jni/SDL2-2.0.3/src/filesystem/unix/SDL_sysfilesystem.c +++ b/jni/SDL2-2.0.4/src/filesystem/unix/SDL_sysfilesystem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/windows/SDL_sysfilesystem.c b/jni/SDL2-2.0.4/src/filesystem/windows/SDL_sysfilesystem.c similarity index 98% rename from jni/SDL2-2.0.3/src/filesystem/windows/SDL_sysfilesystem.c rename to jni/SDL2-2.0.4/src/filesystem/windows/SDL_sysfilesystem.c index 2d1c7819..fd942d75 100644 --- a/jni/SDL2-2.0.3/src/filesystem/windows/SDL_sysfilesystem.c +++ b/jni/SDL2-2.0.4/src/filesystem/windows/SDL_sysfilesystem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/filesystem/winrt/SDL_sysfilesystem.cpp b/jni/SDL2-2.0.4/src/filesystem/winrt/SDL_sysfilesystem.cpp similarity index 99% rename from jni/SDL2-2.0.3/src/filesystem/winrt/SDL_sysfilesystem.cpp rename to jni/SDL2-2.0.4/src/filesystem/winrt/SDL_sysfilesystem.cpp index a70c7fe4..b4caf903 100644 --- a/jni/SDL2-2.0.3/src/filesystem/winrt/SDL_sysfilesystem.cpp +++ b/jni/SDL2-2.0.4/src/filesystem/winrt/SDL_sysfilesystem.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/SDL_haptic.c b/jni/SDL2-2.0.4/src/haptic/SDL_haptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/SDL_haptic.c rename to jni/SDL2-2.0.4/src/haptic/SDL_haptic.c index 0d5c0ef5..ddce908d 100644 --- a/jni/SDL2-2.0.3/src/haptic/SDL_haptic.c +++ b/jni/SDL2-2.0.4/src/haptic/SDL_haptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/SDL_haptic_c.h b/jni/SDL2-2.0.4/src/haptic/SDL_haptic_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/haptic/SDL_haptic_c.h rename to jni/SDL2-2.0.4/src/haptic/SDL_haptic_c.h index 24389c7e..5b9372b5 100644 --- a/jni/SDL2-2.0.3/src/haptic/SDL_haptic_c.h +++ b/jni/SDL2-2.0.4/src/haptic/SDL_haptic_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/SDL_syshaptic.h b/jni/SDL2-2.0.4/src/haptic/SDL_syshaptic.h similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/SDL_syshaptic.h rename to jni/SDL2-2.0.4/src/haptic/SDL_syshaptic.h index a364f8a8..372cefac 100644 --- a/jni/SDL2-2.0.3/src/haptic/SDL_syshaptic.h +++ b/jni/SDL2-2.0.4/src/haptic/SDL_syshaptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic.c b/jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic.c rename to jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic.c index 152f779d..d662012c 100644 --- a/jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic_c.h b/jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic_c.h rename to jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic_c.h index 0af04487..2b72aab3 100644 --- a/jni/SDL2-2.0.3/src/haptic/darwin/SDL_syshaptic_c.h +++ b/jni/SDL2-2.0.4/src/haptic/darwin/SDL_syshaptic_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/dummy/SDL_syshaptic.c b/jni/SDL2-2.0.4/src/haptic/dummy/SDL_syshaptic.c similarity index 98% rename from jni/SDL2-2.0.3/src/haptic/dummy/SDL_syshaptic.c rename to jni/SDL2-2.0.4/src/haptic/dummy/SDL_syshaptic.c index ebff7dae..727e7eca 100644 --- a/jni/SDL2-2.0.3/src/haptic/dummy/SDL_syshaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/dummy/SDL_syshaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/linux/SDL_syshaptic.c b/jni/SDL2-2.0.4/src/haptic/linux/SDL_syshaptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/linux/SDL_syshaptic.c rename to jni/SDL2-2.0.4/src/haptic/linux/SDL_syshaptic.c index 659252b5..e8d78553 100644 --- a/jni/SDL2-2.0.3/src/haptic/linux/SDL_syshaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/linux/SDL_syshaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic.c b/jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic.c rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic.c index 1cd70425..c51470dd 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic_c.h b/jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic_c.h rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic_c.h index d587ab72..3dc0f130 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_dinputhaptic_c.h +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_dinputhaptic_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic.c b/jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic.c rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic.c index a0b6c554..0c038fb1 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic_c.h b/jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic_c.h rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic_c.h index e3de1336..89fdd2cb 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_windowshaptic_c.h +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_windowshaptic_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic.c b/jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic.c similarity index 99% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic.c rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic.c index b5fb2e34..a46ae5f9 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic.c +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic_c.h b/jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic_c.h rename to jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic_c.h index 7917128d..f9a0c85b 100644 --- a/jni/SDL2-2.0.3/src/haptic/windows/SDL_xinputhaptic_c.h +++ b/jni/SDL2-2.0.4/src/haptic/windows/SDL_xinputhaptic_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/SDL_gamecontroller.c b/jni/SDL2-2.0.4/src/joystick/SDL_gamecontroller.c similarity index 96% rename from jni/SDL2-2.0.3/src/joystick/SDL_gamecontroller.c rename to jni/SDL2-2.0.4/src/joystick/SDL_gamecontroller.c index 37e0a8bd..0fd1ef4a 100644 --- a/jni/SDL2-2.0.3/src/joystick/SDL_gamecontroller.c +++ b/jni/SDL2-2.0.4/src/joystick/SDL_gamecontroller.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -254,36 +254,6 @@ ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID *gu return NULL; } -/* - * Helper function to determine pre-calculated offset to certain joystick mappings - */ -ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index) -{ - SDL_JoystickGUID jGUID = SDL_JoystickGetDeviceGUID(device_index); - ControllerMapping_t *mapping; - - mapping = SDL_PrivateGetControllerMappingForGUID(&jGUID); -#if SDL_JOYSTICK_XINPUT - if (!mapping && SDL_SYS_IsXInputGamepad_DeviceIndex(device_index)) { - mapping = s_pXInputMapping; - } -#endif -#if defined(SDL_JOYSTICK_EMSCRIPTEN) - if (!mapping && s_pEmscriptenMapping) { - mapping = s_pEmscriptenMapping; - } -#endif - if (!mapping) { - const char *name = SDL_JoystickNameForIndex(device_index); - if (name) { - if (SDL_strstr(name, "Xbox") || SDL_strstr(name, "X-Box")) { - mapping = s_pXInputMapping; - } - } - } - return mapping; -} - static const char* map_StringForControllerAxis[] = { "leftx", "lefty", @@ -581,6 +551,9 @@ char *SDL_PrivateGetControllerMappingFromMappingString(const char *pMapping) return SDL_strdup(pSecondComma + 1); /* mapping is everything after the 3rd comma */ } +/* + * Helper function to refresh a mapping + */ void SDL_PrivateGameControllerRefreshMapping(ControllerMapping_t *pControllerMapping) { SDL_GameController *gamecontrollerlist = SDL_gamecontrollers; @@ -599,6 +572,102 @@ void SDL_PrivateGameControllerRefreshMapping(ControllerMapping_t *pControllerMap } } +/* + * Helper function to add a mapping for a guid + */ +static ControllerMapping_t * +SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID, const char *mappingString, SDL_bool *existing) +{ + char *pchName; + char *pchMapping; + ControllerMapping_t *pControllerMapping; + + pchName = SDL_PrivateGetControllerNameFromMappingString(mappingString); + if (!pchName) { + SDL_SetError("Couldn't parse name from %s", mappingString); + return NULL; + } + + pchMapping = SDL_PrivateGetControllerMappingFromMappingString(mappingString); + if (!pchMapping) { + SDL_free(pchName); + SDL_SetError("Couldn't parse %s", mappingString); + return NULL; + } + + pControllerMapping = SDL_PrivateGetControllerMappingForGUID(&jGUID); + if (pControllerMapping) { + /* Update existing mapping */ + SDL_free(pControllerMapping->name); + pControllerMapping->name = pchName; + SDL_free(pControllerMapping->mapping); + pControllerMapping->mapping = pchMapping; + /* refresh open controllers */ + SDL_PrivateGameControllerRefreshMapping(pControllerMapping); + *existing = SDL_TRUE; + } else { + pControllerMapping = SDL_malloc(sizeof(*pControllerMapping)); + if (!pControllerMapping) { + SDL_free(pchName); + SDL_free(pchMapping); + SDL_OutOfMemory(); + return NULL; + } + pControllerMapping->guid = jGUID; + pControllerMapping->name = pchName; + pControllerMapping->mapping = pchMapping; + pControllerMapping->next = s_pSupportedControllers; + s_pSupportedControllers = pControllerMapping; + *existing = SDL_FALSE; + } + return pControllerMapping; +} + +/* + * Helper function to determine pre-calculated offset to certain joystick mappings + */ +ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index) +{ + SDL_JoystickGUID jGUID = SDL_JoystickGetDeviceGUID(device_index); + ControllerMapping_t *mapping; + + mapping = SDL_PrivateGetControllerMappingForGUID(&jGUID); +#if SDL_JOYSTICK_XINPUT + if (!mapping && SDL_SYS_IsXInputGamepad_DeviceIndex(device_index)) { + mapping = s_pXInputMapping; + } +#endif +#if defined(SDL_JOYSTICK_EMSCRIPTEN) + if (!mapping && s_pEmscriptenMapping) { + mapping = s_pEmscriptenMapping; + } +#endif +#ifdef __LINUX__ + if (!mapping) { + const char *name = SDL_JoystickNameForIndex(device_index); + if (name) { + if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) { + /* The Linux driver xpad.c maps the wireless dpad to buttons */ + SDL_bool existing; + mapping = SDL_PrivateAddMappingForGUID(jGUID, +"none,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", + &existing); + } + } + } +#endif /* __LINUX__ */ + + if (!mapping) { + const char *name = SDL_JoystickNameForIndex(device_index); + if (name) { + if (SDL_strstr(name, "Xbox") || SDL_strstr(name, "X-Box")) { + mapping = s_pXInputMapping; + } + } + } + return mapping; +} + /* * Add or update an entry into the Mappings Database */ @@ -677,12 +746,11 @@ int SDL_GameControllerAddMapping(const char *mappingString) { char *pchGUID; - char *pchName; - char *pchMapping; SDL_JoystickGUID jGUID; - ControllerMapping_t *pControllerMapping; SDL_bool is_xinput_mapping = SDL_FALSE; SDL_bool is_emscripten_mapping = SDL_FALSE; + SDL_bool existing = SDL_FALSE; + ControllerMapping_t *pControllerMapping; if (!mappingString) { return SDL_InvalidParamError("mappingString"); @@ -701,46 +769,20 @@ SDL_GameControllerAddMapping(const char *mappingString) jGUID = SDL_JoystickGetGUIDFromString(pchGUID); SDL_free(pchGUID); - pchName = SDL_PrivateGetControllerNameFromMappingString(mappingString); - if (!pchName) { - return SDL_SetError("Couldn't parse name from %s", mappingString); + pControllerMapping = SDL_PrivateAddMappingForGUID(jGUID, mappingString, &existing); + if (!pControllerMapping) { + return -1; } - pchMapping = SDL_PrivateGetControllerMappingFromMappingString(mappingString); - if (!pchMapping) { - SDL_free(pchName); - return SDL_SetError("Couldn't parse %s", mappingString); - } - - pControllerMapping = SDL_PrivateGetControllerMappingForGUID(&jGUID); - - if (pControllerMapping) { - /* Update existing mapping */ - SDL_free(pControllerMapping->name); - pControllerMapping->name = pchName; - SDL_free(pControllerMapping->mapping); - pControllerMapping->mapping = pchMapping; - /* refresh open controllers */ - SDL_PrivateGameControllerRefreshMapping(pControllerMapping); + if (existing) { return 0; } else { - pControllerMapping = SDL_malloc(sizeof(*pControllerMapping)); - if (!pControllerMapping) { - SDL_free(pchName); - SDL_free(pchMapping); - return SDL_OutOfMemory(); - } if (is_xinput_mapping) { s_pXInputMapping = pControllerMapping; } if (is_emscripten_mapping) { s_pEmscriptenMapping = pControllerMapping; } - pControllerMapping->guid = jGUID; - pControllerMapping->name = pchName; - pControllerMapping->mapping = pchMapping; - pControllerMapping->next = s_pSupportedControllers; - s_pSupportedControllers = pControllerMapping; return 1; } } diff --git a/jni/SDL2-2.0.3/src/joystick/SDL_gamecontrollerdb.h b/jni/SDL2-2.0.4/src/joystick/SDL_gamecontrollerdb.h similarity index 96% rename from jni/SDL2-2.0.3/src/joystick/SDL_gamecontrollerdb.h rename to jni/SDL2-2.0.4/src/joystick/SDL_gamecontrollerdb.h index 8f42f6b5..211d00d0 100644 --- a/jni/SDL2-2.0.3/src/joystick/SDL_gamecontrollerdb.h +++ b/jni/SDL2-2.0.4/src/joystick/SDL_gamecontrollerdb.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -83,8 +83,6 @@ static const char *s_ControllerMappings [] = "050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", "03000000de280000fc11000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "03000000de280000ff11000001000000,Valve Streaming Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", - "030000005e0400001907000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", - "030000005e0400009102000007010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "030000005e040000d102000001010000,Xbox One Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", #endif diff --git a/jni/SDL2-2.0.3/src/joystick/SDL_joystick.c b/jni/SDL2-2.0.4/src/joystick/SDL_joystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/SDL_joystick.c rename to jni/SDL2-2.0.4/src/joystick/SDL_joystick.c index 8516c03a..dc910a82 100644 --- a/jni/SDL2-2.0.3/src/joystick/SDL_joystick.c +++ b/jni/SDL2-2.0.4/src/joystick/SDL_joystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/SDL_joystick_c.h b/jni/SDL2-2.0.4/src/joystick/SDL_joystick_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/joystick/SDL_joystick_c.h rename to jni/SDL2-2.0.4/src/joystick/SDL_joystick_c.h index 2da74bd3..4a076f6d 100644 --- a/jni/SDL2-2.0.3/src/joystick/SDL_joystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/SDL_joystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/SDL_sysjoystick.h b/jni/SDL2-2.0.4/src/joystick/SDL_sysjoystick.h similarity index 98% rename from jni/SDL2-2.0.3/src/joystick/SDL_sysjoystick.h rename to jni/SDL2-2.0.4/src/joystick/SDL_sysjoystick.h index f03e4042..1015840a 100644 --- a/jni/SDL2-2.0.3/src/joystick/SDL_sysjoystick.h +++ b/jni/SDL2-2.0.4/src/joystick/SDL_sysjoystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick.c index 8ab682d4..8656a532 100644 --- a/jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick_c.h index 2137e33c..49b494c5 100644 --- a/jni/SDL2-2.0.3/src/joystick/android/SDL_sysjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/android/SDL_sysjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/bsd/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/bsd/SDL_sysjoystick.c similarity index 92% rename from jni/SDL2-2.0.3/src/joystick/bsd/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/bsd/SDL_sysjoystick.c index a6fe2f73..509d43f7 100644 --- a/jni/SDL2-2.0.3/src/joystick/bsd/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/bsd/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -76,7 +76,7 @@ #include "../SDL_sysjoystick.h" #include "../SDL_joystick_c.h" -#define MAX_UHID_JOYS 16 +#define MAX_UHID_JOYS 64 #define MAX_JOY_JOYS 2 #define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS) @@ -286,7 +286,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index) struct joystick_hwdata *hw; struct hid_item hitem; struct hid_data *hdata; - struct report *rep; + struct report *rep = NULL; int fd; int i; @@ -337,6 +337,38 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index) #endif rep->rid = -1; /* XXX */ } +#if defined(__NetBSD__) + usb_device_descriptor_t udd; + struct usb_string_desc usd; + if (ioctl(fd, USB_GET_DEVICE_DESC, &udd) == -1) + goto desc_failed; + + /* Get default language */ + usd.usd_string_index = USB_LANGUAGE_TABLE; + usd.usd_language_id = 0; + if (ioctl(fd, USB_GET_STRING_DESC, &usd) == -1 || usd.usd_desc.bLength < 4) { + usd.usd_language_id = 0; + } else { + usd.usd_language_id = UGETW(usd.usd_desc.bString[0]); + } + + usd.usd_string_index = udd.iProduct; + if (ioctl(fd, USB_GET_STRING_DESC, &usd) == 0) { + char str[128]; + char *new_name = NULL; + int i; + for (i = 0; i < (usd.usd_desc.bLength >> 1) - 1 && i < sizeof(str) - 1; i++) { + str[i] = UGETW(usd.usd_desc.bString[i]); + } + str[i] = '\0'; + asprintf(&new_name, "%s @ %s", str, path); + if (new_name != NULL) { + free(joydevnames[SDL_SYS_numjoysticks]); + joydevnames[SDL_SYS_numjoysticks] = new_name; + } + } +desc_failed: +#endif if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) { goto usberr; } @@ -409,9 +441,21 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index) if (hw->axis_map[i] > 0) hw->axis_map[i] = joy->naxes++; + if (joy->naxes == 0 && joy->nbuttons == 0 && joy->nhats == 0 && joy->nballs == 0) { + SDL_SetError("%s: Not a joystick, ignoring", hw->path); + goto usberr; + } + usbend: /* The poll blocks the event thread. */ fcntl(fd, F_SETFL, O_NONBLOCK); +#ifdef __NetBSD__ + /* Flush pending events */ + if (rep) { + while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size) + ; + } +#endif return (0); usberr: diff --git a/jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick.c index 5abb09ce..6dd306aa 100644 --- a/jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -247,6 +247,8 @@ AddHIDElement(const void *value, void *parameter) case kHIDUsage_GD_DPadDown: case kHIDUsage_GD_DPadRight: case kHIDUsage_GD_DPadLeft: + case kHIDUsage_GD_Start: + case kHIDUsage_GD_Select: if (!ElementAlreadyAdded(cookie, pDevice->firstButton)) { element = (recElement *) SDL_calloc(1, sizeof (recElement)); if (element) { diff --git a/jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick_c.h index 0fefa265..1c317eca 100644 --- a/jni/SDL2-2.0.3/src/joystick/darwin/SDL_sysjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/darwin/SDL_sysjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/dummy/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/dummy/SDL_sysjoystick.c similarity index 98% rename from jni/SDL2-2.0.3/src/joystick/dummy/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/dummy/SDL_sysjoystick.c index 6212c0e5..10fda10d 100644 --- a/jni/SDL2-2.0.3/src/joystick/dummy/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/dummy/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/haiku/SDL_haikujoystick.cc b/jni/SDL2-2.0.4/src/joystick/haiku/SDL_haikujoystick.cc similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/haiku/SDL_haikujoystick.cc rename to jni/SDL2-2.0.4/src/joystick/haiku/SDL_haikujoystick.cc index 612f3849..3ec9ae10 100644 --- a/jni/SDL2-2.0.3/src/joystick/haiku/SDL_haikujoystick.cc +++ b/jni/SDL2-2.0.4/src/joystick/haiku/SDL_haikujoystick.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick.c index c6f7911c..8c73859e 100644 --- a/jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick_c.h index 0d7e65d2..ee771783 100644 --- a/jni/SDL2-2.0.3/src/joystick/linux/SDL_sysjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/linux/SDL_sysjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/psp/SDL_sysjoystick.c b/jni/SDL2-2.0.4/src/joystick/psp/SDL_sysjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/psp/SDL_sysjoystick.c rename to jni/SDL2-2.0.4/src/joystick/psp/SDL_sysjoystick.c index 9d20f90d..e5247254 100644 --- a/jni/SDL2-2.0.3/src/joystick/psp/SDL_sysjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/psp/SDL_sysjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/sort_controllers.py b/jni/SDL2-2.0.4/src/joystick/sort_controllers.py similarity index 100% rename from jni/SDL2-2.0.3/src/joystick/sort_controllers.py rename to jni/SDL2-2.0.4/src/joystick/sort_controllers.py diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick.c b/jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick.c rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick.c index 61d5b386..f6b0cc88 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick_c.h index f93b1209..7e4ff3e1 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_dinputjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_dinputjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_mmjoystick.c b/jni/SDL2-2.0.4/src/joystick/windows/SDL_mmjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_mmjoystick.c rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_mmjoystick.c index 65b16ab9..37461818 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_mmjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_mmjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick.c b/jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick.c rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick.c index c06fad0d..7123c615 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick_c.h index 5f991dc2..ab946b4f 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_windowsjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_windowsjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick.c b/jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick.c rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick.c index cf71f5c3..2f27c47d 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick.c +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick_c.h b/jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick_c.h rename to jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick_c.h index ed6087bc..b3ba8c02 100644 --- a/jni/SDL2-2.0.3/src/joystick/windows/SDL_xinputjoystick_c.h +++ b/jni/SDL2-2.0.4/src/joystick/windows/SDL_xinputjoystick_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/libm/e_atan2.c b/jni/SDL2-2.0.4/src/libm/e_atan2.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/e_atan2.c rename to jni/SDL2-2.0.4/src/libm/e_atan2.c diff --git a/jni/SDL2-2.0.3/src/libm/e_log.c b/jni/SDL2-2.0.4/src/libm/e_log.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/e_log.c rename to jni/SDL2-2.0.4/src/libm/e_log.c diff --git a/jni/SDL2-2.0.3/src/libm/e_pow.c b/jni/SDL2-2.0.4/src/libm/e_pow.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/e_pow.c rename to jni/SDL2-2.0.4/src/libm/e_pow.c diff --git a/jni/SDL2-2.0.3/src/libm/e_rem_pio2.c b/jni/SDL2-2.0.4/src/libm/e_rem_pio2.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/e_rem_pio2.c rename to jni/SDL2-2.0.4/src/libm/e_rem_pio2.c diff --git a/jni/SDL2-2.0.3/src/libm/e_sqrt.c b/jni/SDL2-2.0.4/src/libm/e_sqrt.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/e_sqrt.c rename to jni/SDL2-2.0.4/src/libm/e_sqrt.c diff --git a/jni/SDL2-2.0.3/src/libm/k_cos.c b/jni/SDL2-2.0.4/src/libm/k_cos.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/k_cos.c rename to jni/SDL2-2.0.4/src/libm/k_cos.c diff --git a/jni/SDL2-2.0.3/src/libm/k_rem_pio2.c b/jni/SDL2-2.0.4/src/libm/k_rem_pio2.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/k_rem_pio2.c rename to jni/SDL2-2.0.4/src/libm/k_rem_pio2.c diff --git a/jni/SDL2-2.0.3/src/libm/k_sin.c b/jni/SDL2-2.0.4/src/libm/k_sin.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/k_sin.c rename to jni/SDL2-2.0.4/src/libm/k_sin.c diff --git a/jni/SDL2-2.0.3/src/libm/k_tan.c b/jni/SDL2-2.0.4/src/libm/k_tan.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/k_tan.c rename to jni/SDL2-2.0.4/src/libm/k_tan.c diff --git a/jni/SDL2-2.0.3/src/libm/math_libm.h b/jni/SDL2-2.0.4/src/libm/math_libm.h similarity index 96% rename from jni/SDL2-2.0.3/src/libm/math_libm.h rename to jni/SDL2-2.0.4/src/libm/math_libm.h index 9e91073e..3fe1727a 100644 --- a/jni/SDL2-2.0.3/src/libm/math_libm.h +++ b/jni/SDL2-2.0.4/src/libm/math_libm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/libm/math_private.h b/jni/SDL2-2.0.4/src/libm/math_private.h similarity index 100% rename from jni/SDL2-2.0.3/src/libm/math_private.h rename to jni/SDL2-2.0.4/src/libm/math_private.h diff --git a/jni/SDL2-2.0.3/src/libm/s_atan.c b/jni/SDL2-2.0.4/src/libm/s_atan.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_atan.c rename to jni/SDL2-2.0.4/src/libm/s_atan.c diff --git a/jni/SDL2-2.0.3/src/libm/s_copysign.c b/jni/SDL2-2.0.4/src/libm/s_copysign.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_copysign.c rename to jni/SDL2-2.0.4/src/libm/s_copysign.c diff --git a/jni/SDL2-2.0.3/src/libm/s_cos.c b/jni/SDL2-2.0.4/src/libm/s_cos.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_cos.c rename to jni/SDL2-2.0.4/src/libm/s_cos.c diff --git a/jni/SDL2-2.0.3/src/libm/s_fabs.c b/jni/SDL2-2.0.4/src/libm/s_fabs.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_fabs.c rename to jni/SDL2-2.0.4/src/libm/s_fabs.c diff --git a/jni/SDL2-2.0.3/src/libm/s_floor.c b/jni/SDL2-2.0.4/src/libm/s_floor.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_floor.c rename to jni/SDL2-2.0.4/src/libm/s_floor.c diff --git a/jni/SDL2-2.0.3/src/libm/s_scalbn.c b/jni/SDL2-2.0.4/src/libm/s_scalbn.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_scalbn.c rename to jni/SDL2-2.0.4/src/libm/s_scalbn.c diff --git a/jni/SDL2-2.0.3/src/libm/s_sin.c b/jni/SDL2-2.0.4/src/libm/s_sin.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_sin.c rename to jni/SDL2-2.0.4/src/libm/s_sin.c diff --git a/jni/SDL2-2.0.3/src/libm/s_tan.c b/jni/SDL2-2.0.4/src/libm/s_tan.c similarity index 100% rename from jni/SDL2-2.0.3/src/libm/s_tan.c rename to jni/SDL2-2.0.4/src/libm/s_tan.c diff --git a/jni/SDL2-2.0.3/src/loadso/dlopen/SDL_sysloadso.c b/jni/SDL2-2.0.4/src/loadso/dlopen/SDL_sysloadso.c similarity index 97% rename from jni/SDL2-2.0.3/src/loadso/dlopen/SDL_sysloadso.c rename to jni/SDL2-2.0.4/src/loadso/dlopen/SDL_sysloadso.c index f3dffefd..03ffae12 100644 --- a/jni/SDL2-2.0.3/src/loadso/dlopen/SDL_sysloadso.c +++ b/jni/SDL2-2.0.4/src/loadso/dlopen/SDL_sysloadso.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/loadso/dummy/SDL_sysloadso.c b/jni/SDL2-2.0.4/src/loadso/dummy/SDL_sysloadso.c similarity index 96% rename from jni/SDL2-2.0.3/src/loadso/dummy/SDL_sysloadso.c rename to jni/SDL2-2.0.4/src/loadso/dummy/SDL_sysloadso.c index a38b5697..4f132f9f 100644 --- a/jni/SDL2-2.0.3/src/loadso/dummy/SDL_sysloadso.c +++ b/jni/SDL2-2.0.4/src/loadso/dummy/SDL_sysloadso.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/loadso/haiku/SDL_sysloadso.c b/jni/SDL2-2.0.4/src/loadso/haiku/SDL_sysloadso.c similarity index 97% rename from jni/SDL2-2.0.3/src/loadso/haiku/SDL_sysloadso.c rename to jni/SDL2-2.0.4/src/loadso/haiku/SDL_sysloadso.c index a5f12950..1336d9e1 100644 --- a/jni/SDL2-2.0.3/src/loadso/haiku/SDL_sysloadso.c +++ b/jni/SDL2-2.0.4/src/loadso/haiku/SDL_sysloadso.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/loadso/windows/SDL_sysloadso.c b/jni/SDL2-2.0.4/src/loadso/windows/SDL_sysloadso.c similarity index 97% rename from jni/SDL2-2.0.3/src/loadso/windows/SDL_sysloadso.c rename to jni/SDL2-2.0.4/src/loadso/windows/SDL_sysloadso.c index 1c1d8cfa..bdb2b987 100644 --- a/jni/SDL2-2.0.3/src/loadso/windows/SDL_sysloadso.c +++ b/jni/SDL2-2.0.4/src/loadso/windows/SDL_sysloadso.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/main/android/SDL_android_main.c b/jni/SDL2-2.0.4/src/main/android/SDL_android_main.c similarity index 100% rename from jni/SDL2-2.0.3/src/main/android/SDL_android_main.c rename to jni/SDL2-2.0.4/src/main/android/SDL_android_main.c diff --git a/jni/SDL2-2.0.3/src/main/dummy/SDL_dummy_main.c b/jni/SDL2-2.0.4/src/main/dummy/SDL_dummy_main.c similarity index 100% rename from jni/SDL2-2.0.3/src/main/dummy/SDL_dummy_main.c rename to jni/SDL2-2.0.4/src/main/dummy/SDL_dummy_main.c diff --git a/jni/SDL2-2.0.3/src/main/haiku/SDL_BApp.h b/jni/SDL2-2.0.4/src/main/haiku/SDL_BApp.h similarity index 99% rename from jni/SDL2-2.0.3/src/main/haiku/SDL_BApp.h rename to jni/SDL2-2.0.4/src/main/haiku/SDL_BApp.h index 1c5dbb84..157c2363 100644 --- a/jni/SDL2-2.0.3/src/main/haiku/SDL_BApp.h +++ b/jni/SDL2-2.0.4/src/main/haiku/SDL_BApp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.cc b/jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.cc similarity index 98% rename from jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.cc rename to jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.cc index f09afb2e..36c2a1ab 100644 --- a/jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.cc +++ b/jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.h b/jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.h similarity index 95% rename from jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.h rename to jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.h index b1cb9501..6700a3be 100644 --- a/jni/SDL2-2.0.3/src/main/haiku/SDL_BeApp.h +++ b/jni/SDL2-2.0.4/src/main/haiku/SDL_BeApp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/main/nacl/SDL_nacl_main.c b/jni/SDL2-2.0.4/src/main/nacl/SDL_nacl_main.c similarity index 98% rename from jni/SDL2-2.0.3/src/main/nacl/SDL_nacl_main.c rename to jni/SDL2-2.0.4/src/main/nacl/SDL_nacl_main.c index 378db7af..4c01d0fb 100644 --- a/jni/SDL2-2.0.3/src/main/nacl/SDL_nacl_main.c +++ b/jni/SDL2-2.0.4/src/main/nacl/SDL_nacl_main.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/main/psp/SDL_psp_main.c b/jni/SDL2-2.0.4/src/main/psp/SDL_psp_main.c similarity index 100% rename from jni/SDL2-2.0.3/src/main/psp/SDL_psp_main.c rename to jni/SDL2-2.0.4/src/main/psp/SDL_psp_main.c diff --git a/jni/SDL2-2.0.3/src/main/windows/SDL_windows_main.c b/jni/SDL2-2.0.4/src/main/windows/SDL_windows_main.c similarity index 100% rename from jni/SDL2-2.0.3/src/main/windows/SDL_windows_main.c rename to jni/SDL2-2.0.4/src/main/windows/SDL_windows_main.c diff --git a/jni/SDL2-2.0.3/src/main/windows/version.rc b/jni/SDL2-2.0.4/src/main/windows/version.rc similarity index 89% rename from jni/SDL2-2.0.3/src/main/windows/version.rc rename to jni/SDL2-2.0.4/src/main/windows/version.rc index d9fbffc7..b4f79b23 100644 --- a/jni/SDL2-2.0.3/src/main/windows/version.rc +++ b/jni/SDL2-2.0.4/src/main/windows/version.rc @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "SDL\0" VALUE "FileVersion", "2, 0, 4, 0\0" VALUE "InternalName", "SDL\0" - VALUE "LegalCopyright", "Copyright © 2015 Sam Lantinga\0" + VALUE "LegalCopyright", "Copyright © 2016 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" VALUE "ProductVersion", "2, 0, 4, 0\0" diff --git a/jni/SDL2-2.0.3/src/main/winrt/SDL_winrt_main_NonXAML.cpp b/jni/SDL2-2.0.4/src/main/winrt/SDL_winrt_main_NonXAML.cpp similarity index 100% rename from jni/SDL2-2.0.3/src/main/winrt/SDL_winrt_main_NonXAML.cpp rename to jni/SDL2-2.0.4/src/main/winrt/SDL_winrt_main_NonXAML.cpp diff --git a/jni/SDL2-2.0.3/src/power/SDL_power.c b/jni/SDL2-2.0.4/src/power/SDL_power.c similarity index 98% rename from jni/SDL2-2.0.3/src/power/SDL_power.c rename to jni/SDL2-2.0.4/src/power/SDL_power.c index 8f919f2e..016013b9 100644 --- a/jni/SDL2-2.0.3/src/power/SDL_power.c +++ b/jni/SDL2-2.0.4/src/power/SDL_power.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/android/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/android/SDL_syspower.c similarity index 96% rename from jni/SDL2-2.0.3/src/power/android/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/android/SDL_syspower.c index 94a4ff4c..5a4b0fc1 100644 --- a/jni/SDL2-2.0.3/src/power/android/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/android/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/haiku/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/haiku/SDL_syspower.c similarity index 98% rename from jni/SDL2-2.0.3/src/power/haiku/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/haiku/SDL_syspower.c index 2d87806a..cfda8c96 100644 --- a/jni/SDL2-2.0.3/src/power/haiku/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/haiku/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/linux/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/linux/SDL_syspower.c similarity index 99% rename from jni/SDL2-2.0.3/src/power/linux/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/linux/SDL_syspower.c index 3986489f..793e2666 100644 --- a/jni/SDL2-2.0.3/src/power/linux/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/linux/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/macosx/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/macosx/SDL_syspower.c similarity index 98% rename from jni/SDL2-2.0.3/src/power/macosx/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/macosx/SDL_syspower.c index d029de5d..f865d59e 100644 --- a/jni/SDL2-2.0.3/src/power/macosx/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/macosx/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/psp/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/psp/SDL_syspower.c similarity index 97% rename from jni/SDL2-2.0.3/src/power/psp/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/psp/SDL_syspower.c index 55011080..76c21b94 100644 --- a/jni/SDL2-2.0.3/src/power/psp/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/psp/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.h b/jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.h similarity index 95% rename from jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.h rename to jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.h index 7b0e5242..4cfa5c97 100644 --- a/jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.h +++ b/jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.m b/jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.m similarity index 98% rename from jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.m rename to jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.m index 2851c109..14ce3576 100644 --- a/jni/SDL2-2.0.3/src/power/uikit/SDL_syspower.m +++ b/jni/SDL2-2.0.4/src/power/uikit/SDL_syspower.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/windows/SDL_syspower.c b/jni/SDL2-2.0.4/src/power/windows/SDL_syspower.c similarity index 97% rename from jni/SDL2-2.0.3/src/power/windows/SDL_syspower.c rename to jni/SDL2-2.0.4/src/power/windows/SDL_syspower.c index 5c9e0240..ff3784cc 100644 --- a/jni/SDL2-2.0.3/src/power/windows/SDL_syspower.c +++ b/jni/SDL2-2.0.4/src/power/windows/SDL_syspower.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/power/winrt/SDL_syspower.cpp b/jni/SDL2-2.0.4/src/power/winrt/SDL_syspower.cpp similarity index 96% rename from jni/SDL2-2.0.3/src/power/winrt/SDL_syspower.cpp rename to jni/SDL2-2.0.4/src/power/winrt/SDL_syspower.cpp index cce6bede..94e5a285 100644 --- a/jni/SDL2-2.0.3/src/power/winrt/SDL_syspower.cpp +++ b/jni/SDL2-2.0.4/src/power/winrt/SDL_syspower.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_d3dmath.c b/jni/SDL2-2.0.4/src/render/SDL_d3dmath.c similarity index 98% rename from jni/SDL2-2.0.3/src/render/SDL_d3dmath.c rename to jni/SDL2-2.0.4/src/render/SDL_d3dmath.c index 058b3af2..83d67bfa 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_d3dmath.c +++ b/jni/SDL2-2.0.4/src/render/SDL_d3dmath.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_d3dmath.h b/jni/SDL2-2.0.4/src/render/SDL_d3dmath.h similarity index 96% rename from jni/SDL2-2.0.3/src/render/SDL_d3dmath.h rename to jni/SDL2-2.0.4/src/render/SDL_d3dmath.h index 34a226d5..87c44c7a 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_d3dmath.h +++ b/jni/SDL2-2.0.4/src/render/SDL_d3dmath.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_render.c b/jni/SDL2-2.0.4/src/render/SDL_render.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/SDL_render.c rename to jni/SDL2-2.0.4/src/render/SDL_render.c index f00688b0..923973ec 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_render.c +++ b/jni/SDL2-2.0.4/src/render/SDL_render.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -158,7 +158,8 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event) } } else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) { renderer->hidden = SDL_TRUE; - } else if (event->window.event == SDL_WINDOWEVENT_RESTORED) { + } else if (event->window.event == SDL_WINDOWEVENT_RESTORED || + event->window.event == SDL_WINDOWEVENT_MAXIMIZED) { if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) { renderer->hidden = SDL_FALSE; } diff --git a/jni/SDL2-2.0.3/src/render/SDL_sysrender.h b/jni/SDL2-2.0.4/src/render/SDL_sysrender.h similarity index 99% rename from jni/SDL2-2.0.3/src/render/SDL_sysrender.h rename to jni/SDL2-2.0.4/src/render/SDL_sysrender.h index 9c74ebbe..19dfe8e6 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_sysrender.h +++ b/jni/SDL2-2.0.4/src/render/SDL_sysrender.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_yuv_mmx.c b/jni/SDL2-2.0.4/src/render/SDL_yuv_mmx.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/SDL_yuv_mmx.c rename to jni/SDL2-2.0.4/src/render/SDL_yuv_mmx.c index f9320bfb..0de776a3 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_yuv_mmx.c +++ b/jni/SDL2-2.0.4/src/render/SDL_yuv_mmx.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_yuv_sw.c b/jni/SDL2-2.0.4/src/render/SDL_yuv_sw.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/SDL_yuv_sw.c rename to jni/SDL2-2.0.4/src/render/SDL_yuv_sw.c index a9ad87aa..7fc6b886 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_yuv_sw.c +++ b/jni/SDL2-2.0.4/src/render/SDL_yuv_sw.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/SDL_yuv_sw_c.h b/jni/SDL2-2.0.4/src/render/SDL_yuv_sw_c.h similarity index 98% rename from jni/SDL2-2.0.3/src/render/SDL_yuv_sw_c.h rename to jni/SDL2-2.0.4/src/render/SDL_yuv_sw_c.h index 3b3a266f..2752096f 100644 --- a/jni/SDL2-2.0.3/src/render/SDL_yuv_sw_c.h +++ b/jni/SDL2-2.0.4/src/render/SDL_yuv_sw_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/direct3d/SDL_render_d3d.c b/jni/SDL2-2.0.4/src/render/direct3d/SDL_render_d3d.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/direct3d/SDL_render_d3d.c rename to jni/SDL2-2.0.4/src/render/direct3d/SDL_render_d3d.c index 910ceb37..9d756422 100644 --- a/jni/SDL2-2.0.3/src/render/direct3d/SDL_render_d3d.c +++ b/jni/SDL2-2.0.4/src/render/direct3d/SDL_render_d3d.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_d3d11.c b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_d3d11.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_d3d11.c rename to jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_d3d11.c index 941c3d79..a48eacee 100644 --- a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_d3d11.c +++ b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_d3d11.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.cpp b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.cpp rename to jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.cpp index 99136662..99f2b4ea 100644 --- a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.cpp +++ b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.h b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.h rename to jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.h index 5c76b70f..734ebf41 100644 --- a/jni/SDL2-2.0.3/src/render/direct3d11/SDL_render_winrt.h +++ b/jni/SDL2-2.0.4/src/render/direct3d11/SDL_render_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/mmx.h b/jni/SDL2-2.0.4/src/render/mmx.h similarity index 100% rename from jni/SDL2-2.0.3/src/render/mmx.h rename to jni/SDL2-2.0.4/src/render/mmx.h diff --git a/jni/SDL2-2.0.3/src/render/opengl/SDL_glfuncs.h b/jni/SDL2-2.0.4/src/render/opengl/SDL_glfuncs.h similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengl/SDL_glfuncs.h rename to jni/SDL2-2.0.4/src/render/opengl/SDL_glfuncs.h index a9f38c43..c8eba583 100644 --- a/jni/SDL2-2.0.3/src/render/opengl/SDL_glfuncs.h +++ b/jni/SDL2-2.0.4/src/render/opengl/SDL_glfuncs.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengl/SDL_render_gl.c b/jni/SDL2-2.0.4/src/render/opengl/SDL_render_gl.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengl/SDL_render_gl.c rename to jni/SDL2-2.0.4/src/render/opengl/SDL_render_gl.c index f5ac96d0..6a4fa3ec 100644 --- a/jni/SDL2-2.0.3/src/render/opengl/SDL_render_gl.c +++ b/jni/SDL2-2.0.4/src/render/opengl/SDL_render_gl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -393,7 +393,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) const char *hint; GLint value; Uint32 window_flags; - int profile_mask, major, minor; + int profile_mask = 0, major = 0, minor = 0; SDL_bool changed_window = SDL_FALSE; SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask); @@ -1052,7 +1052,7 @@ GL_UpdateClipRect(SDL_Renderer * renderer) int w, h; SDL_GetRendererOutputSize(renderer, &w, &h); - data->glScissor(renderer->viewport.x + rect->x, (h - renderer->viewport.y - renderer->viewport.h) + rect->y, rect->w, rect->h); + data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { data->glDisable(GL_SCISSOR_TEST); diff --git a/jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.c b/jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.c rename to jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.c index f0885523..bcf7b431 100644 --- a/jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.c +++ b/jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.h b/jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.h rename to jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.h index 1b2e4a5a..261627cc 100644 --- a/jni/SDL2-2.0.3/src/render/opengl/SDL_shaders_gl.h +++ b/jni/SDL2-2.0.4/src/render/opengl/SDL_shaders_gl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengles/SDL_glesfuncs.h b/jni/SDL2-2.0.4/src/render/opengles/SDL_glesfuncs.h similarity index 98% rename from jni/SDL2-2.0.3/src/render/opengles/SDL_glesfuncs.h rename to jni/SDL2-2.0.4/src/render/opengles/SDL_glesfuncs.h index 4eb72d6b..a15d76d4 100644 --- a/jni/SDL2-2.0.3/src/render/opengles/SDL_glesfuncs.h +++ b/jni/SDL2-2.0.4/src/render/opengles/SDL_glesfuncs.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengles/SDL_render_gles.c b/jni/SDL2-2.0.4/src/render/opengles/SDL_render_gles.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengles/SDL_render_gles.c rename to jni/SDL2-2.0.4/src/render/opengles/SDL_render_gles.c index 21c22bfd..0d59da36 100644 --- a/jni/SDL2-2.0.3/src/render/opengles/SDL_render_gles.c +++ b/jni/SDL2-2.0.4/src/render/opengles/SDL_render_gles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -285,7 +285,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) GLES_RenderData *data; GLint value; Uint32 window_flags; - int profile_mask, major, minor; + int profile_mask = 0, major = 0, minor = 0; SDL_bool changed_window = SDL_FALSE; SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask); @@ -721,7 +721,7 @@ GLES_UpdateClipRect(SDL_Renderer * renderer) int w, h; SDL_GetRendererOutputSize(renderer, &w, &h); - data->glScissor(renderer->viewport.x + rect->x, (h - renderer->viewport.y - renderer->viewport.h) + rect->y, rect->w, rect->h); + data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { data->glDisable(GL_SCISSOR_TEST); diff --git a/jni/SDL2-2.0.3/src/render/opengles2/SDL_gles2funcs.h b/jni/SDL2-2.0.4/src/render/opengles2/SDL_gles2funcs.h similarity index 98% rename from jni/SDL2-2.0.3/src/render/opengles2/SDL_gles2funcs.h rename to jni/SDL2-2.0.4/src/render/opengles2/SDL_gles2funcs.h index 36dcf742..0ecfa7f9 100644 --- a/jni/SDL2-2.0.3/src/render/opengles2/SDL_gles2funcs.h +++ b/jni/SDL2-2.0.4/src/render/opengles2/SDL_gles2funcs.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengles2/SDL_render_gles2.c b/jni/SDL2-2.0.4/src/render/opengles2/SDL_render_gles2.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengles2/SDL_render_gles2.c rename to jni/SDL2-2.0.4/src/render/opengles2/SDL_render_gles2.c index 7254cb7a..e41ab623 100644 --- a/jni/SDL2-2.0.3/src/render/opengles2/SDL_render_gles2.c +++ b/jni/SDL2-2.0.4/src/render/opengles2/SDL_render_gles2.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -418,7 +418,7 @@ GLES2_UpdateClipRect(SDL_Renderer * renderer) int w, h; SDL_GetRendererOutputSize(renderer, &w, &h); - data->glScissor(renderer->viewport.x + rect->x, (h - renderer->viewport.y - renderer->viewport.h) + rect->y, rect->w, rect->h); + data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { data->glDisable(GL_SCISSOR_TEST); @@ -1956,7 +1956,7 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) Uint32 window_flags; GLint window_framebuffer; GLint value; - int profile_mask, major, minor; + int profile_mask = 0, major = 0, minor = 0; SDL_bool changed_window = SDL_FALSE; SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask); diff --git a/jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.c b/jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.c rename to jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.c index 6f650811..0c01a8c6 100644 --- a/jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.c +++ b/jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.h b/jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.h similarity index 96% rename from jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.h rename to jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.h index f22c8f56..3958ae00 100644 --- a/jni/SDL2-2.0.3/src/render/opengles2/SDL_shaders_gles2.h +++ b/jni/SDL2-2.0.4/src/render/opengles2/SDL_shaders_gles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/psp/SDL_render_psp.c b/jni/SDL2-2.0.4/src/render/psp/SDL_render_psp.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/psp/SDL_render_psp.c rename to jni/SDL2-2.0.4/src/render/psp/SDL_render_psp.c index 39a2eab6..8e8c8735 100644 --- a/jni/SDL2-2.0.3/src/render/psp/SDL_render_psp.c +++ b/jni/SDL2-2.0.4/src/render/psp/SDL_render_psp.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.c b/jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.c rename to jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.c index 669422f7..7cfb274a 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.h b/jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.h rename to jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.h index b612db24..88bb2e2c 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendfillrect.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendfillrect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendline.c b/jni/SDL2-2.0.4/src/render/software/SDL_blendline.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendline.c rename to jni/SDL2-2.0.4/src/render/software/SDL_blendline.c index b2090b13..ef0d5853 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendline.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendline.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendline.h b/jni/SDL2-2.0.4/src/render/software/SDL_blendline.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendline.h rename to jni/SDL2-2.0.4/src/render/software/SDL_blendline.h index 602cafd6..c0b545f3 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendline.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendline.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.c b/jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.c rename to jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.c index 47243794..fc42dfe7 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.h b/jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.h rename to jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.h index 7045326a..58ddec7e 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_blendpoint.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_blendpoint.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_draw.h b/jni/SDL2-2.0.4/src/render/software/SDL_draw.h similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_draw.h rename to jni/SDL2-2.0.4/src/render/software/SDL_draw.h index e2822427..3a5e7cf1 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_draw.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_draw.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_drawline.c b/jni/SDL2-2.0.4/src/render/software/SDL_drawline.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_drawline.c rename to jni/SDL2-2.0.4/src/render/software/SDL_drawline.c index e76c3f40..fd50ea74 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_drawline.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_drawline.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_drawline.h b/jni/SDL2-2.0.4/src/render/software/SDL_drawline.h similarity index 94% rename from jni/SDL2-2.0.3/src/render/software/SDL_drawline.h rename to jni/SDL2-2.0.4/src/render/software/SDL_drawline.h index e2dafeae..40721c3f 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_drawline.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_drawline.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.c b/jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.c similarity index 98% rename from jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.c rename to jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.c index 38ea4b74..98f0d83c 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.h b/jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.h similarity index 94% rename from jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.h rename to jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.h index d26c2b58..e77857ac 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_drawpoint.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_drawpoint.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_render_sw.c b/jni/SDL2-2.0.4/src/render/software/SDL_render_sw.c similarity index 99% rename from jni/SDL2-2.0.3/src/render/software/SDL_render_sw.c rename to jni/SDL2-2.0.4/src/render/software/SDL_render_sw.c index 119b2001..dadd2442 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_render_sw.c +++ b/jni/SDL2-2.0.4/src/render/software/SDL_render_sw.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_render_sw_c.h b/jni/SDL2-2.0.4/src/render/software/SDL_render_sw_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/render/software/SDL_render_sw_c.h rename to jni/SDL2-2.0.4/src/render/software/SDL_render_sw_c.h index df1a6473..89b4e8ac 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_render_sw_c.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_render_sw_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_rotate.c b/jni/SDL2-2.0.4/src/render/software/SDL_rotate.c similarity index 100% rename from jni/SDL2-2.0.3/src/render/software/SDL_rotate.c rename to jni/SDL2-2.0.4/src/render/software/SDL_rotate.c diff --git a/jni/SDL2-2.0.3/src/render/software/SDL_rotate.h b/jni/SDL2-2.0.4/src/render/software/SDL_rotate.h similarity index 95% rename from jni/SDL2-2.0.3/src/render/software/SDL_rotate.h rename to jni/SDL2-2.0.4/src/render/software/SDL_rotate.h index 01ceb2d8..338109fc 100644 --- a/jni/SDL2-2.0.3/src/render/software/SDL_rotate.h +++ b/jni/SDL2-2.0.4/src/render/software/SDL_rotate.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_getenv.c b/jni/SDL2-2.0.4/src/stdlib/SDL_getenv.c similarity index 99% rename from jni/SDL2-2.0.3/src/stdlib/SDL_getenv.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_getenv.c index 7936498c..3fc4119f 100644 --- a/jni/SDL2-2.0.3/src/stdlib/SDL_getenv.c +++ b/jni/SDL2-2.0.4/src/stdlib/SDL_getenv.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_iconv.c b/jni/SDL2-2.0.4/src/stdlib/SDL_iconv.c similarity index 99% rename from jni/SDL2-2.0.3/src/stdlib/SDL_iconv.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_iconv.c index 31efb426..8f040373 100644 --- a/jni/SDL2-2.0.3/src/stdlib/SDL_iconv.c +++ b/jni/SDL2-2.0.4/src/stdlib/SDL_iconv.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_malloc.c b/jni/SDL2-2.0.4/src/stdlib/SDL_malloc.c similarity index 99% rename from jni/SDL2-2.0.3/src/stdlib/SDL_malloc.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_malloc.c index 996e5d24..d640c8fa 100644 --- a/jni/SDL2-2.0.3/src/stdlib/SDL_malloc.c +++ b/jni/SDL2-2.0.4/src/stdlib/SDL_malloc.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_qsort.c b/jni/SDL2-2.0.4/src/stdlib/SDL_qsort.c similarity index 100% rename from jni/SDL2-2.0.3/src/stdlib/SDL_qsort.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_qsort.c diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_stdlib.c b/jni/SDL2-2.0.4/src/stdlib/SDL_stdlib.c similarity index 99% rename from jni/SDL2-2.0.3/src/stdlib/SDL_stdlib.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_stdlib.c index a488af26..f11f65d6 100644 --- a/jni/SDL2-2.0.3/src/stdlib/SDL_stdlib.c +++ b/jni/SDL2-2.0.4/src/stdlib/SDL_stdlib.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/stdlib/SDL_string.c b/jni/SDL2-2.0.4/src/stdlib/SDL_string.c similarity index 99% rename from jni/SDL2-2.0.3/src/stdlib/SDL_string.c rename to jni/SDL2-2.0.4/src/stdlib/SDL_string.c index 68d88ece..5debb228 100644 --- a/jni/SDL2-2.0.3/src/stdlib/SDL_string.c +++ b/jni/SDL2-2.0.4/src/stdlib/SDL_string.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_assert.c b/jni/SDL2-2.0.4/src/test/SDL_test_assert.c similarity index 98% rename from jni/SDL2-2.0.3/src/test/SDL_test_assert.c rename to jni/SDL2-2.0.4/src/test/SDL_test_assert.c index 12eca146..98a84d38 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_assert.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_assert.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_common.c b/jni/SDL2-2.0.4/src/test/SDL_test_common.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_common.c rename to jni/SDL2-2.0.4/src/test/SDL_test_common.c index 2f06a794..fee249cb 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_common.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_common.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_compare.c b/jni/SDL2-2.0.4/src/test/SDL_test_compare.c similarity index 98% rename from jni/SDL2-2.0.3/src/test/SDL_test_compare.c rename to jni/SDL2-2.0.4/src/test/SDL_test_compare.c index 9f74c44d..45eb3c68 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_compare.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_compare.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_crc32.c b/jni/SDL2-2.0.4/src/test/SDL_test_crc32.c similarity index 98% rename from jni/SDL2-2.0.3/src/test/SDL_test_crc32.c rename to jni/SDL2-2.0.4/src/test/SDL_test_crc32.c index 7aa0a68f..6e122088 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_crc32.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_crc32.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_font.c b/jni/SDL2-2.0.4/src/test/SDL_test_font.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_font.c rename to jni/SDL2-2.0.4/src/test/SDL_test_font.c index 4be29f11..afd35c6c 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_font.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_font.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_fuzzer.c b/jni/SDL2-2.0.4/src/test/SDL_test_fuzzer.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_fuzzer.c rename to jni/SDL2-2.0.4/src/test/SDL_test_fuzzer.c index 9fad1785..1bd8dfa1 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_fuzzer.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_fuzzer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_harness.c b/jni/SDL2-2.0.4/src/test/SDL_test_harness.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_harness.c rename to jni/SDL2-2.0.4/src/test/SDL_test_harness.c index 6dde93f8..fec34164 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_harness.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_harness.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_imageBlit.c b/jni/SDL2-2.0.4/src/test/SDL_test_imageBlit.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_imageBlit.c rename to jni/SDL2-2.0.4/src/test/SDL_test_imageBlit.c index 1b9ed7bf..5896ca09 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_imageBlit.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_imageBlit.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_imageBlitBlend.c b/jni/SDL2-2.0.4/src/test/SDL_test_imageBlitBlend.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_imageBlitBlend.c rename to jni/SDL2-2.0.4/src/test/SDL_test_imageBlitBlend.c index 963520bd..6e8c2f1b 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_imageBlitBlend.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_imageBlitBlend.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_imageFace.c b/jni/SDL2-2.0.4/src/test/SDL_test_imageFace.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_imageFace.c rename to jni/SDL2-2.0.4/src/test/SDL_test_imageFace.c index 37498d87..84f5037f 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_imageFace.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_imageFace.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitives.c b/jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitives.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitives.c rename to jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitives.c index 5576d3d2..4ab48d2d 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitives.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitives.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitivesBlend.c b/jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitivesBlend.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitivesBlend.c rename to jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitivesBlend.c index c8e19930..5e538628 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_imagePrimitivesBlend.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_imagePrimitivesBlend.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_log.c b/jni/SDL2-2.0.4/src/test/SDL_test_log.c similarity index 98% rename from jni/SDL2-2.0.3/src/test/SDL_test_log.c rename to jni/SDL2-2.0.4/src/test/SDL_test_log.c index ed7139b6..097372e7 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_log.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_log.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_md5.c b/jni/SDL2-2.0.4/src/test/SDL_test_md5.c similarity index 99% rename from jni/SDL2-2.0.3/src/test/SDL_test_md5.c rename to jni/SDL2-2.0.4/src/test/SDL_test_md5.c index 291ad6b2..7cc35675 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_md5.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_md5.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/test/SDL_test_random.c b/jni/SDL2-2.0.4/src/test/SDL_test_random.c similarity index 97% rename from jni/SDL2-2.0.3/src/test/SDL_test_random.c rename to jni/SDL2-2.0.4/src/test/SDL_test_random.c index 088c301a..c5baaa64 100644 --- a/jni/SDL2-2.0.3/src/test/SDL_test_random.c +++ b/jni/SDL2-2.0.4/src/test/SDL_test_random.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/SDL_systhread.h b/jni/SDL2-2.0.4/src/thread/SDL_systhread.h similarity index 97% rename from jni/SDL2-2.0.3/src/thread/SDL_systhread.h rename to jni/SDL2-2.0.4/src/thread/SDL_systhread.h index d3eab1f3..f13f3e20 100644 --- a/jni/SDL2-2.0.3/src/thread/SDL_systhread.h +++ b/jni/SDL2-2.0.4/src/thread/SDL_systhread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/SDL_thread.c b/jni/SDL2-2.0.4/src/thread/SDL_thread.c similarity index 99% rename from jni/SDL2-2.0.3/src/thread/SDL_thread.c rename to jni/SDL2-2.0.4/src/thread/SDL_thread.c index 8bc37fac..e66c5819 100644 --- a/jni/SDL2-2.0.3/src/thread/SDL_thread.c +++ b/jni/SDL2-2.0.4/src/thread/SDL_thread.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/SDL_thread_c.h b/jni/SDL2-2.0.4/src/thread/SDL_thread_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/thread/SDL_thread_c.h rename to jni/SDL2-2.0.4/src/thread/SDL_thread_c.h index 2df71254..a283a0e2 100644 --- a/jni/SDL2-2.0.3/src/thread/SDL_thread_c.h +++ b/jni/SDL2-2.0.4/src/thread/SDL_thread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_syscond.c b/jni/SDL2-2.0.4/src/thread/generic/SDL_syscond.c similarity index 99% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_syscond.c rename to jni/SDL2-2.0.4/src/thread/generic/SDL_syscond.c index 6e7f9b33..e2ccd88e 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_syscond.c +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_syscond.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex.c b/jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex.c rename to jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex.c index 0c7a8514..f2f66897 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex.c +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex_c.h b/jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex_c.h rename to jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex_c.h index 7481b665..9dba5e16 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex_c.h +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_sysmutex_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_syssem.c b/jni/SDL2-2.0.4/src/thread/generic/SDL_syssem.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_syssem.c rename to jni/SDL2-2.0.4/src/thread/generic/SDL_syssem.c index cae084db..92afcb0c 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_syssem.c +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_syssem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_systhread.c b/jni/SDL2-2.0.4/src/thread/generic/SDL_systhread.c similarity index 96% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_systhread.c rename to jni/SDL2-2.0.4/src/thread/generic/SDL_systhread.c index b248165f..7a81a620 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_systhread.c +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_systhread.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_systhread_c.h b/jni/SDL2-2.0.4/src/thread/generic/SDL_systhread_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_systhread_c.h rename to jni/SDL2-2.0.4/src/thread/generic/SDL_systhread_c.h index 30ba69ea..ea9b7146 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_systhread_c.h +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_systhread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_systls.c b/jni/SDL2-2.0.4/src/thread/generic/SDL_systls.c similarity index 95% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_systls.c rename to jni/SDL2-2.0.4/src/thread/generic/SDL_systls.c index 99bfce77..e29c1981 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_systls.c +++ b/jni/SDL2-2.0.4/src/thread/generic/SDL_systls.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_syscond.c b/jni/SDL2-2.0.4/src/thread/psp/SDL_syscond.c similarity index 99% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_syscond.c rename to jni/SDL2-2.0.4/src/thread/psp/SDL_syscond.c index d4ff59d5..a84b206c 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_syscond.c +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_syscond.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex.c b/jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex.c rename to jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex.c index e0f411ea..78129fa6 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_sysmutex.c +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex_c.h b/jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex_c.h rename to jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex_c.h index 7481b665..9dba5e16 100644 --- a/jni/SDL2-2.0.3/src/thread/generic/SDL_sysmutex_c.h +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_sysmutex_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_syssem.c b/jni/SDL2-2.0.4/src/thread/psp/SDL_syssem.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_syssem.c rename to jni/SDL2-2.0.4/src/thread/psp/SDL_syssem.c index cfbbe433..643406c4 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_syssem.c +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_syssem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_systhread.c b/jni/SDL2-2.0.4/src/thread/psp/SDL_systhread.c similarity index 97% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_systhread.c rename to jni/SDL2-2.0.4/src/thread/psp/SDL_systhread.c index 95141cc8..ab8aff37 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_systhread.c +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_systhread.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/psp/SDL_systhread_c.h b/jni/SDL2-2.0.4/src/thread/psp/SDL_systhread_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/psp/SDL_systhread_c.h rename to jni/SDL2-2.0.4/src/thread/psp/SDL_systhread_c.h index 2c5de1ba..4f74df06 100644 --- a/jni/SDL2-2.0.3/src/thread/psp/SDL_systhread_c.h +++ b/jni/SDL2-2.0.4/src/thread/psp/SDL_systhread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_syscond.c b/jni/SDL2-2.0.4/src/thread/pthread/SDL_syscond.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_syscond.c rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_syscond.c index 2b0e0a53..998ac55b 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_syscond.c +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_syscond.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex.c b/jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex.c rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex.c index d7fa982c..f24cfdab 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex.c +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex_c.h b/jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex_c.h rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex_c.h index 475275a2..ee60ca04 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_sysmutex_c.h +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_sysmutex_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_syssem.c b/jni/SDL2-2.0.4/src/thread/pthread/SDL_syssem.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_syssem.c rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_syssem.c index a89a262a..b7547e69 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_syssem.c +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_syssem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread.c b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread.c similarity index 97% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread.c rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread.c index 14eee8de..22f7bd57 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread.c +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -143,7 +143,11 @@ SDL_SYS_SetupThread(const char *name) #endif } #elif HAVE_PTHREAD_SETNAME_NP + #if defined(__NETBSD__) + pthread_setname_np(pthread_self(), "%s", name); + #else pthread_setname_np(pthread_self(), name); + #endif #elif HAVE_PTHREAD_SET_NAME_NP pthread_set_name_np(pthread_self(), name); #elif defined(__HAIKU__) diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread_c.h b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread_c.h rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread_c.h index 3a25f47a..4ad18844 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systhread_c.h +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systhread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systls.c b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systls.c similarity index 97% rename from jni/SDL2-2.0.3/src/thread/pthread/SDL_systls.c rename to jni/SDL2-2.0.4/src/thread/pthread/SDL_systls.c index 0440af57..622ad029 100644 --- a/jni/SDL2-2.0.3/src/thread/pthread/SDL_systls.c +++ b/jni/SDL2-2.0.4/src/thread/pthread/SDL_systls.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_syscond.cpp b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_syscond.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/thread/stdcpp/SDL_syscond.cpp rename to jni/SDL2-2.0.4/src/thread/stdcpp/SDL_syscond.cpp index 69e10685..976bff48 100644 --- a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_syscond.cpp +++ b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_syscond.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex.cpp b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex.cpp similarity index 97% rename from jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex.cpp rename to jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex.cpp index da411612..04028627 100644 --- a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex.cpp +++ b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex_c.h b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex_c.h rename to jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex_c.h index d7b5b218..ab0f2dd8 100644 --- a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_sysmutex_c.h +++ b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_sysmutex_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread.cpp b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread.cpp rename to jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread.cpp index ab8e1505..219c67e9 100644 --- a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread.cpp +++ b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread_c.h b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread_c.h rename to jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread_c.h index d3affedc..c3cc507c 100644 --- a/jni/SDL2-2.0.3/src/thread/stdcpp/SDL_systhread_c.h +++ b/jni/SDL2-2.0.4/src/thread/stdcpp/SDL_systhread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/windows/SDL_sysmutex.c b/jni/SDL2-2.0.4/src/thread/windows/SDL_sysmutex.c similarity index 97% rename from jni/SDL2-2.0.3/src/thread/windows/SDL_sysmutex.c rename to jni/SDL2-2.0.4/src/thread/windows/SDL_sysmutex.c index 3b75ded8..413cb670 100644 --- a/jni/SDL2-2.0.3/src/thread/windows/SDL_sysmutex.c +++ b/jni/SDL2-2.0.4/src/thread/windows/SDL_sysmutex.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/windows/SDL_syssem.c b/jni/SDL2-2.0.4/src/thread/windows/SDL_syssem.c similarity index 98% rename from jni/SDL2-2.0.3/src/thread/windows/SDL_syssem.c rename to jni/SDL2-2.0.4/src/thread/windows/SDL_syssem.c index 1f0a8dfc..86b58882 100644 --- a/jni/SDL2-2.0.3/src/thread/windows/SDL_syssem.c +++ b/jni/SDL2-2.0.4/src/thread/windows/SDL_syssem.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/windows/SDL_systhread.c b/jni/SDL2-2.0.4/src/thread/windows/SDL_systhread.c similarity index 99% rename from jni/SDL2-2.0.3/src/thread/windows/SDL_systhread.c rename to jni/SDL2-2.0.4/src/thread/windows/SDL_systhread.c index 9217ebc3..308145e3 100644 --- a/jni/SDL2-2.0.3/src/thread/windows/SDL_systhread.c +++ b/jni/SDL2-2.0.4/src/thread/windows/SDL_systhread.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/windows/SDL_systhread_c.h b/jni/SDL2-2.0.4/src/thread/windows/SDL_systhread_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/thread/windows/SDL_systhread_c.h rename to jni/SDL2-2.0.4/src/thread/windows/SDL_systhread_c.h index 0beafe88..90866a7b 100644 --- a/jni/SDL2-2.0.3/src/thread/windows/SDL_systhread_c.h +++ b/jni/SDL2-2.0.4/src/thread/windows/SDL_systhread_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/thread/windows/SDL_systls.c b/jni/SDL2-2.0.4/src/thread/windows/SDL_systls.c similarity index 97% rename from jni/SDL2-2.0.3/src/thread/windows/SDL_systls.c rename to jni/SDL2-2.0.4/src/thread/windows/SDL_systls.c index 67c84741..7ec630e8 100644 --- a/jni/SDL2-2.0.3/src/thread/windows/SDL_systls.c +++ b/jni/SDL2-2.0.4/src/thread/windows/SDL_systls.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/SDL_timer.c b/jni/SDL2-2.0.4/src/timer/SDL_timer.c similarity index 99% rename from jni/SDL2-2.0.3/src/timer/SDL_timer.c rename to jni/SDL2-2.0.4/src/timer/SDL_timer.c index 2e5e544c..6189ab8b 100644 --- a/jni/SDL2-2.0.3/src/timer/SDL_timer.c +++ b/jni/SDL2-2.0.4/src/timer/SDL_timer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/SDL_timer_c.h b/jni/SDL2-2.0.4/src/timer/SDL_timer_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/timer/SDL_timer_c.h rename to jni/SDL2-2.0.4/src/timer/SDL_timer_c.h index ab1e16ac..6ae81705 100644 --- a/jni/SDL2-2.0.3/src/timer/SDL_timer_c.h +++ b/jni/SDL2-2.0.4/src/timer/SDL_timer_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/dummy/SDL_systimer.c b/jni/SDL2-2.0.4/src/timer/dummy/SDL_systimer.c similarity index 96% rename from jni/SDL2-2.0.3/src/timer/dummy/SDL_systimer.c rename to jni/SDL2-2.0.4/src/timer/dummy/SDL_systimer.c index 0a63bfab..1174d224 100644 --- a/jni/SDL2-2.0.3/src/timer/dummy/SDL_systimer.c +++ b/jni/SDL2-2.0.4/src/timer/dummy/SDL_systimer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/haiku/SDL_systimer.c b/jni/SDL2-2.0.4/src/timer/haiku/SDL_systimer.c similarity index 96% rename from jni/SDL2-2.0.3/src/timer/haiku/SDL_systimer.c rename to jni/SDL2-2.0.4/src/timer/haiku/SDL_systimer.c index ea736ba7..f45aa64d 100644 --- a/jni/SDL2-2.0.3/src/timer/haiku/SDL_systimer.c +++ b/jni/SDL2-2.0.4/src/timer/haiku/SDL_systimer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/psp/SDL_systimer.c b/jni/SDL2-2.0.4/src/timer/psp/SDL_systimer.c similarity index 97% rename from jni/SDL2-2.0.3/src/timer/psp/SDL_systimer.c rename to jni/SDL2-2.0.4/src/timer/psp/SDL_systimer.c index ece71d37..1e8802cf 100644 --- a/jni/SDL2-2.0.3/src/timer/psp/SDL_systimer.c +++ b/jni/SDL2-2.0.4/src/timer/psp/SDL_systimer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/unix/SDL_systimer.c b/jni/SDL2-2.0.4/src/timer/unix/SDL_systimer.c similarity index 98% rename from jni/SDL2-2.0.3/src/timer/unix/SDL_systimer.c rename to jni/SDL2-2.0.4/src/timer/unix/SDL_systimer.c index 98917214..217fe327 100644 --- a/jni/SDL2-2.0.3/src/timer/unix/SDL_systimer.c +++ b/jni/SDL2-2.0.4/src/timer/unix/SDL_systimer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/timer/windows/SDL_systimer.c b/jni/SDL2-2.0.4/src/timer/windows/SDL_systimer.c similarity index 98% rename from jni/SDL2-2.0.3/src/timer/windows/SDL_systimer.c rename to jni/SDL2-2.0.4/src/timer/windows/SDL_systimer.c index a213be00..abfbcb99 100644 --- a/jni/SDL2-2.0.3/src/timer/windows/SDL_systimer.c +++ b/jni/SDL2-2.0.4/src/timer/windows/SDL_systimer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_RLEaccel.c b/jni/SDL2-2.0.4/src/video/SDL_RLEaccel.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_RLEaccel.c rename to jni/SDL2-2.0.4/src/video/SDL_RLEaccel.c index b9f1426d..67baaf66 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_RLEaccel.c +++ b/jni/SDL2-2.0.4/src/video/SDL_RLEaccel.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_RLEaccel_c.h b/jni/SDL2-2.0.4/src/video/SDL_RLEaccel_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/SDL_RLEaccel_c.h rename to jni/SDL2-2.0.4/src/video/SDL_RLEaccel_c.h index ed980f98..c04fc152 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_RLEaccel_c.h +++ b/jni/SDL2-2.0.4/src/video/SDL_RLEaccel_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit.c b/jni/SDL2-2.0.4/src/video/SDL_blit.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit.c rename to jni/SDL2-2.0.4/src/video/SDL_blit.c index 1c8b0735..90aa8789 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit.h b/jni/SDL2-2.0.4/src/video/SDL_blit.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit.h rename to jni/SDL2-2.0.4/src/video/SDL_blit.h index 6b8effff..e30f8afe 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit.h +++ b/jni/SDL2-2.0.4/src/video/SDL_blit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_0.c b/jni/SDL2-2.0.4/src/video/SDL_blit_0.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit_0.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_0.c index 64e20f8e..fe7330d7 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_0.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_0.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_1.c b/jni/SDL2-2.0.4/src/video/SDL_blit_1.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit_1.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_1.c index 53f486b9..69c15d08 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_1.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_1.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_A.c b/jni/SDL2-2.0.4/src/video/SDL_blit_A.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit_A.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_A.c index 4ba7c82c..0190ffdd 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_A.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_A.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_N.c b/jni/SDL2-2.0.4/src/video/SDL_blit_N.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit_N.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_N.c index c0c7fbfb..94894a78 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_N.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_N.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_auto.c b/jni/SDL2-2.0.4/src/video/SDL_blit_auto.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_blit_auto.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_auto.c index 987d12d8..f1228191 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_auto.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_auto.c @@ -1,7 +1,7 @@ /* DO NOT EDIT! This file is generated by sdlgenblit.pl */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_auto.h b/jni/SDL2-2.0.4/src/video/SDL_blit_auto.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/SDL_blit_auto.h rename to jni/SDL2-2.0.4/src/video/SDL_blit_auto.h index 7ba689c7..58a532db 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_auto.h +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_auto.h @@ -1,7 +1,7 @@ /* DO NOT EDIT! This file is generated by sdlgenblit.pl */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_copy.c b/jni/SDL2-2.0.4/src/video/SDL_blit_copy.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/SDL_blit_copy.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_copy.c index 3ec2e7eb..7b9a91ff 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_copy.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_copy.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_copy.h b/jni/SDL2-2.0.4/src/video/SDL_blit_copy.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/SDL_blit_copy.h rename to jni/SDL2-2.0.4/src/video/SDL_blit_copy.h index 73defa2f..060026d8 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_copy.h +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_copy.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_slow.c b/jni/SDL2-2.0.4/src/video/SDL_blit_slow.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/SDL_blit_slow.c rename to jni/SDL2-2.0.4/src/video/SDL_blit_slow.c index 9082f7a6..3a462f6e 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_slow.c +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_slow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_blit_slow.h b/jni/SDL2-2.0.4/src/video/SDL_blit_slow.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/SDL_blit_slow.h rename to jni/SDL2-2.0.4/src/video/SDL_blit_slow.h index 5bd0598a..75005fc5 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_blit_slow.h +++ b/jni/SDL2-2.0.4/src/video/SDL_blit_slow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_bmp.c b/jni/SDL2-2.0.4/src/video/SDL_bmp.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_bmp.c rename to jni/SDL2-2.0.4/src/video/SDL_bmp.c index 3ea2dd54..f80f9369 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_bmp.c +++ b/jni/SDL2-2.0.4/src/video/SDL_bmp.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_clipboard.c b/jni/SDL2-2.0.4/src/video/SDL_clipboard.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/SDL_clipboard.c rename to jni/SDL2-2.0.4/src/video/SDL_clipboard.c index feff8eb3..91d1eeea 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_clipboard.c +++ b/jni/SDL2-2.0.4/src/video/SDL_clipboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_egl.c b/jni/SDL2-2.0.4/src/video/SDL_egl.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_egl.c rename to jni/SDL2-2.0.4/src/video/SDL_egl.c index 7b1c690e..bfd4affb 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_egl.c +++ b/jni/SDL2-2.0.4/src/video/SDL_egl.c @@ -1,6 +1,6 @@ /* * Simple DirectMedia Layer - * Copyright (C) 1997-2015 Sam Lantinga + * Copyright (C) 1997-2016 Sam Lantinga * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_egl_c.h b/jni/SDL2-2.0.4/src/video/SDL_egl_c.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/SDL_egl_c.h rename to jni/SDL2-2.0.4/src/video/SDL_egl_c.h index b46cfca6..c683dffa 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_egl_c.h +++ b/jni/SDL2-2.0.4/src/video/SDL_egl_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_fillrect.c b/jni/SDL2-2.0.4/src/video/SDL_fillrect.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_fillrect.c rename to jni/SDL2-2.0.4/src/video/SDL_fillrect.c index 2282d2b1..e34a43c4 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_fillrect.c +++ b/jni/SDL2-2.0.4/src/video/SDL_fillrect.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_pixels.c b/jni/SDL2-2.0.4/src/video/SDL_pixels.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_pixels.c rename to jni/SDL2-2.0.4/src/video/SDL_pixels.c index 6b96125b..d905656c 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_pixels.c +++ b/jni/SDL2-2.0.4/src/video/SDL_pixels.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_pixels_c.h b/jni/SDL2-2.0.4/src/video/SDL_pixels_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/SDL_pixels_c.h rename to jni/SDL2-2.0.4/src/video/SDL_pixels_c.h index 3d2deb1a..4ee91b8a 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_pixels_c.h +++ b/jni/SDL2-2.0.4/src/video/SDL_pixels_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_rect.c b/jni/SDL2-2.0.4/src/video/SDL_rect.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_rect.c rename to jni/SDL2-2.0.4/src/video/SDL_rect.c index b2295195..2b29451c 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_rect.c +++ b/jni/SDL2-2.0.4/src/video/SDL_rect.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_rect_c.h b/jni/SDL2-2.0.4/src/video/SDL_rect_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/SDL_rect_c.h rename to jni/SDL2-2.0.4/src/video/SDL_rect_c.h index bc639ae2..aa5fbde7 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_rect_c.h +++ b/jni/SDL2-2.0.4/src/video/SDL_rect_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_shape.c b/jni/SDL2-2.0.4/src/video/SDL_shape.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_shape.c rename to jni/SDL2-2.0.4/src/video/SDL_shape.c index 3309f6db..4a2e5465 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_shape.c +++ b/jni/SDL2-2.0.4/src/video/SDL_shape.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_shape_internals.h b/jni/SDL2-2.0.4/src/video/SDL_shape_internals.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/SDL_shape_internals.h rename to jni/SDL2-2.0.4/src/video/SDL_shape_internals.h index 4eda9dd1..bdb0ee91 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_shape_internals.h +++ b/jni/SDL2-2.0.4/src/video/SDL_shape_internals.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_stretch.c b/jni/SDL2-2.0.4/src/video/SDL_stretch.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_stretch.c rename to jni/SDL2-2.0.4/src/video/SDL_stretch.c index d3abaed5..bb34dffb 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_stretch.c +++ b/jni/SDL2-2.0.4/src/video/SDL_stretch.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_surface.c b/jni/SDL2-2.0.4/src/video/SDL_surface.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_surface.c rename to jni/SDL2-2.0.4/src/video/SDL_surface.c index ef581fa9..dae07f28 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_surface.c +++ b/jni/SDL2-2.0.4/src/video/SDL_surface.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_sysvideo.h b/jni/SDL2-2.0.4/src/video/SDL_sysvideo.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_sysvideo.h rename to jni/SDL2-2.0.4/src/video/SDL_sysvideo.h index 5e3e1526..77426c3e 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_sysvideo.h +++ b/jni/SDL2-2.0.4/src/video/SDL_sysvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/SDL_video.c b/jni/SDL2-2.0.4/src/video/SDL_video.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/SDL_video.c rename to jni/SDL2-2.0.4/src/video/SDL_video.c index 753eac98..511b4c08 100644 --- a/jni/SDL2-2.0.3/src/video/SDL_video.c +++ b/jni/SDL2-2.0.4/src/video/SDL_video.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -1488,6 +1488,7 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags) if (window->surface) { window->surface->flags &= ~SDL_DONTFREE; SDL_FreeSurface(window->surface); + window->surface = NULL; } if (_this->DestroyWindowFramebuffer) { _this->DestroyWindowFramebuffer(_this, window); @@ -2913,18 +2914,8 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) void (APIENTRY *glGetFramebufferAttachmentParameterivFunc) (GLenum target, GLenum attachment, GLenum pname, GLint* params); GLenum attachment = GL_BACK_LEFT; GLenum attachmentattrib = 0; - - glGetStringFunc = SDL_GL_GetProcAddress("glGetString"); - if (!glGetStringFunc) { - return SDL_SetError("Failed getting OpenGL glGetString entry point"); - } #endif - glGetErrorFunc = SDL_GL_GetProcAddress("glGetError"); - if (!glGetErrorFunc) { - return SDL_SetError("Failed getting OpenGL glGetError entry point"); - } - /* Clear value in any case */ *value = 0; @@ -3095,6 +3086,11 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) } #if SDL_VIDEO_OPENGL + glGetStringFunc = SDL_GL_GetProcAddress("glGetString"); + if (!glGetStringFunc) { + return SDL_SetError("Failed getting OpenGL glGetString entry point"); + } + if (attachmentattrib && isAtLeastGL3((const char *) glGetStringFunc(GL_VERSION))) { glGetFramebufferAttachmentParameterivFunc = SDL_GL_GetProcAddress("glGetFramebufferAttachmentParameteriv"); @@ -3115,6 +3111,11 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) } } + glGetErrorFunc = SDL_GL_GetProcAddress("glGetError"); + if (!glGetErrorFunc) { + return SDL_SetError("Failed getting OpenGL glGetError entry point"); + } + error = glGetErrorFunc(); if (error != GL_NO_ERROR) { if (error == GL_INVALID_ENUM) { diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.c index 6a456472..b996e7a4 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.h index 600771b9..a61045ae 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidclipboard.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidclipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidevents.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidevents.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidevents.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidevents.c index f15180a9..326361af 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidevents.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidevents.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidevents.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidevents.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidevents.h index 888a593c..4a2230e2 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidevents.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidgl.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidgl.c similarity index 96% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidgl.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidgl.c index 5bf8d1a1..4cfe8635 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidgl.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidgl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.c index a6123517..dc8951ff 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.h index 3f643c30..ced9bc24 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidkeyboard.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidkeyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.c index 1783b9cd..61f67636 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.h index b732a2a0..3c680c62 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidmessagebox.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidmessagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.c index 795b2aab..3e9c0aff 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.h index 72b3deb3..9b68eed5 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidmouse.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidmouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.c index b7ba3860..a6e0b896 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.h index 73a934fe..2ad096ce 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidtouch.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidtouch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.c index 983f3aa3..e14b9664 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.h index fc6e60e8..0f76a91b 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidvideo.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.c b/jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.c rename to jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.c index 46eaeb2a..37a928fa 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.c +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.h b/jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.h rename to jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.h index aa9283bc..3ac99f42 100644 --- a/jni/SDL2-2.0.3/src/video/android/SDL_androidwindow.h +++ b/jni/SDL2-2.0.4/src/video/android/SDL_androidwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.h index d86a75ef..871b394f 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.m similarity index 98% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.m index 73307445..015d7710 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaclipboard.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaclipboard.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.h index f92a4a94..ea40e531 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.m index 994da182..e0da11fd 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaevents.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaevents.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.h index e206bd3a..4f9da018 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.m similarity index 88% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.m index 39431876..7f1d2308 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoakeyboard.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoakeyboard.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -33,25 +33,27 @@ /*#define DEBUG_IME NSLog */ #define DEBUG_IME(...) -@interface SDLTranslatorResponder : NSView { +@interface SDLTranslatorResponder : NSView { NSString *_markedText; NSRange _markedRange; NSRange _selectedRange; SDL_Rect _inputRect; } -- (void) doCommandBySelector:(SEL)myselector; -- (void) setInputRect:(SDL_Rect *) rect; +- (void)doCommandBySelector:(SEL)myselector; +- (void)setInputRect:(SDL_Rect *)rect; @end @implementation SDLTranslatorResponder -- (void) setInputRect:(SDL_Rect *) rect +- (void)setInputRect:(SDL_Rect *)rect { _inputRect = *rect; } -- (void) insertText:(id) aString +- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange { + /* TODO: Make use of replacementRange? */ + const char *str; DEBUG_IME(@"insertText: %@", aString); @@ -67,7 +69,15 @@ SDL_SendKeyboardText(str); } -- (void) doCommandBySelector:(SEL) myselector +- (void)insertText:(id)insertString +{ + /* This method is part of NSTextInput and not NSTextInputClient, but + * apparently it still might be called in OS X 10.5 and can cause beeps if + * the implementation is missing: http://crbug.com/47890 */ + [self insertText:insertString replacementRange:NSMakeRange(0, 0)]; +} + +- (void)doCommandBySelector:(SEL)myselector { /* No need to do anything since we are not using Cocoa selectors to handle special keys, instead we use SDL @@ -75,23 +85,22 @@ */ } -- (BOOL) hasMarkedText +- (BOOL)hasMarkedText { return _markedText != nil; } -- (NSRange) markedRange +- (NSRange)markedRange { return _markedRange; } -- (NSRange) selectedRange +- (NSRange)selectedRange { return _selectedRange; } -- (void) setMarkedText:(id) aString - selectedRange:(NSRange) selRange +- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange; { if ([aString isKindOfClass: [NSAttributedString class]]) { aString = [aString string]; @@ -107,17 +116,17 @@ _markedText = [aString retain]; } - _selectedRange = selRange; + _selectedRange = selectedRange; _markedRange = NSMakeRange(0, [aString length]); SDL_SendEditingText([aString UTF8String], - selRange.location, selRange.length); + selectedRange.location, selectedRange.length); DEBUG_IME(@"setMarkedText: %@, (%d, %d)", _markedText, selRange.location, selRange.length); } -- (void) unmarkText +- (void)unmarkText { [_markedText release]; _markedText = nil; @@ -125,29 +134,38 @@ SDL_SendEditingText("", 0, 0); } -- (NSRect) firstRectForCharacterRange: (NSRange) theRange +- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange; { NSWindow *window = [self window]; - NSRect contentRect = [window contentRectForFrameRect: [window frame]]; + NSRect contentRect = [window contentRectForFrameRect:[window frame]]; float windowHeight = contentRect.size.height; NSRect rect = NSMakeRect(_inputRect.x, windowHeight - _inputRect.y - _inputRect.h, _inputRect.w, _inputRect.h); + if (actualRange) { + *actualRange = aRange; + } + DEBUG_IME(@"firstRectForCharacterRange: (%d, %d): windowHeight = %g, rect = %@", - theRange.location, theRange.length, windowHeight, + aRange.location, aRange.length, windowHeight, NSStringFromRect(rect)); - rect.origin = [[self window] convertBaseToScreen: rect.origin]; + + if ([[self window] respondsToSelector:@selector(convertRectToScreen:)]) { + rect = [[self window] convertRectToScreen:rect]; + } else { + rect.origin = [[self window] convertBaseToScreen:rect.origin]; + } return rect; } -- (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange +- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange; { - DEBUG_IME(@"attributedSubstringFromRange: (%d, %d)", theRange.location, theRange.length); + DEBUG_IME(@"attributedSubstringFromRange: (%d, %d)", aRange.location, aRange.length); return nil; } -- (NSInteger) conversationIdentifier +- (NSInteger)conversationIdentifier { return (NSInteger) self; } @@ -155,7 +173,7 @@ /* This method returns the index for character that is * nearest to thePoint. thPoint is in screen coordinate system. */ -- (NSUInteger) characterIndexForPoint:(NSPoint) thePoint +- (NSUInteger)characterIndexForPoint:(NSPoint)thePoint { DEBUG_IME(@"characterIndexForPoint: (%g, %g)", thePoint.x, thePoint.y); return 0; @@ -166,7 +184,7 @@ * NSInputServer examines the return value of this * method & constructs appropriate attributed string. */ -- (NSArray *) validAttributesForMarkedText +- (NSArray *)validAttributesForMarkedText { return [NSArray array]; } @@ -479,6 +497,12 @@ Cocoa_InitKeyboard(_THIS) SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Command"); SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option"); SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command"); + + /* On pre-10.6, you might have the initial capslock key state wrong. */ + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_6) { + data->modifierFlags = [NSEvent modifierFlags]; + SDL_ToggleModState(KMOD_CAPS, (data->modifierFlags & NSAlphaShiftKeyMask) != 0); + } } void @@ -504,7 +528,7 @@ Cocoa_StartTextInput(_THIS) [[SDLTranslatorResponder alloc] initWithFrame: NSMakeRect(0.0, 0.0, 0.0, 0.0)]; } - if (![[data->fieldEdit superview] isEqual: parentView]) { + if (![[data->fieldEdit superview] isEqual:parentView]) { /* DEBUG_IME(@"add fieldEdit to window contentView"); */ [data->fieldEdit removeFromSuperview]; [parentView addSubview: data->fieldEdit]; @@ -535,7 +559,7 @@ Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect) return; } - [data->fieldEdit setInputRect: rect]; + [data->fieldEdit setInputRect:rect]; } void diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.h index f9ac0c45..d1ca7882 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.m similarity index 98% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.m index 0998f792..ed59e728 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamessagebox.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamessagebox.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.h index 57c22ebd..a0a29f50 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.m index 73b14ed7..7d98264a 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamodes.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamodes.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.h index 89e68caa..4f60c837 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.m index 625d8f40..c7683312 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamouse.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamouse.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.h index f1041b18..af92314b 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.m index ca50ff96..ed70f3ca 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoamousetap.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoamousetap.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.h index 6b18af1e..1f7bd57f 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.m index d8e9c901..aa360998 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoaopengl.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoaopengl.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.h index e7fd185d..f64b5917 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.m similarity index 98% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.m index 1dce5679..cd5d97b7 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoashape.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoashape.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.h index 873f2573..498ce6cc 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.m index c6b01296..b8f775dd 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoavideo.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoavideo.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.h b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.h rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.h index ed56600f..1037badf 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.h +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.m b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.m similarity index 98% rename from jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.m rename to jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.m index c815db54..a4da6cb2 100644 --- a/jni/SDL2-2.0.3/src/video/cocoa/SDL_cocoawindow.m +++ b/jni/SDL2-2.0.4/src/video/cocoa/SDL_cocoawindow.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -588,6 +588,13 @@ SetWindowStyle(SDL_Window * window, unsigned int style) if ((isFullscreenSpace) && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)) { [NSMenu setMenuBarVisible:NO]; } + + /* On pre-10.6, you might have the capslock key state wrong now because we can't check here. */ + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_6) { + const unsigned int newflags = [NSEvent modifierFlags] & NSAlphaShiftKeyMask; + _data->videodata->modifierFlags = (_data->videodata->modifierFlags & ~NSAlphaShiftKeyMask) | newflags; + SDL_ToggleModState(KMOD_CAPS, newflags != 0); + } } - (void)windowDidResignKey:(NSNotification *)aNotification @@ -816,7 +823,14 @@ SetWindowStyle(SDL_Window * window, unsigned int style) /* Ignore events that aren't inside the client area (i.e. title bar.) */ if ([theEvent window]) { - const NSRect windowRect = [[[theEvent window] contentView] frame]; + NSRect windowRect = [[[theEvent window] contentView] frame]; + + /* add one to size, since NSPointInRect is exclusive of the bottom + edges, which mean it misses the top of the window by one pixel + (as the origin is the bottom left). */ + windowRect.size.width += 1; + windowRect.size.height += 1; + if (!NSPointInRect([theEvent locationInWindow], windowRect)) { return; } diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.c index f6e1dea4..4b979f36 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.h index 828bd952..f5f9a46f 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_WM.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_WM.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.c index 4dfd08c1..52a4b536 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.h index 81d2b163..bd99a3fa 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_dyn.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_dyn.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.c index 8508f2a9..0bf9fdba 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.h index fe205d1d..2931ad2a 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_events.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.c index ab13b7ee..9d0abf56 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.h index c847f182..9911eff5 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_modes.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_modes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.c index caa9eeec..0657d2f0 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.h index 3f62c01b..4e2f27a9 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_mouse.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.c index edddd32c..065854a0 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.h index 454aa249..6391ee4f 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_opengl.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.c index 003e4a77..4a1bf46b 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.h index 0cd4bd32..be016b08 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_render.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.c index 4c571572..3239e302 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.h index 27304712..46be39fb 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_shape.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.c index dbf890be..5579759e 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.h index b722bbd9..b36ace0d 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_video.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.c b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.c rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.c index b8a94b45..3b8b45d4 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.c +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.h b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.h rename to jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.h index 9290abcd..658cc874 100644 --- a/jni/SDL2-2.0.3/src/video/directfb/SDL_DirectFB_window.h +++ b/jni/SDL2-2.0.4/src/video/directfb/SDL_DirectFB_window.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents.c b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents.c rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents.c index d7df0dcb..a5a94430 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents.c +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents_c.h b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents_c.h rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents_c.h index 21168464..d2f78698 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullevents_c.h +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer.c b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer.c rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer.c index 74eeb310..01c8a5ab 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer.c +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer_c.h b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer_c.h rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer_c.h index f75c70e8..37d198f9 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullframebuffer_c.h +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullframebuffer_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.c b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.c rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.c index 96cee921..96f47813 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.c +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.h b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.h rename to jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.h index 90ed3bc8..0126ba18 100644 --- a/jni/SDL2-2.0.3/src/video/dummy/SDL_nullvideo.h +++ b/jni/SDL2-2.0.4/src/video/dummy/SDL_nullvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_BWin.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_BWin.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_BWin.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_BWin.h index b4e347d0..dade664c 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_BWin.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_BWin.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.cc similarity index 97% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.cc index 1a10b6bf..fcd1caa2 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.h index 654c6c59..dd31f19a 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bclipboard.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bclipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.cc similarity index 95% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.cc index ec7d0125..36513a3b 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.h index ffb9ba5e..cb756c96 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bevents.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.cc similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.cc index 3eb835b2..5e6a300e 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.h index f3fbd96f..d6be21f4 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bframebuffer.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bframebuffer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.cc similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.cc index e12d30ba..0ae3d3fc 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.h index edf7643d..63279942 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bkeyboard.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bkeyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.cc similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.cc index c5da410f..84aeb1f0 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.h index e73c090e..c3882ba5 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bmodes.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bmodes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.cc similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.cc index 25869992..15454f10 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.h index e325687f..e7d475df 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bopengl.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bopengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.cc similarity index 98% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.cc index 9fe24d34..8c243b7a 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.h index 72292d00..ef5c7403 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bvideo.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.cc b/jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.cc similarity index 99% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.cc rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.cc index dc3ddb5d..287eac96 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.cc +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.cc @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.h b/jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.h rename to jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.h index e1c59134..f64530ab 100644 --- a/jni/SDL2-2.0.3/src/video/haiku/SDL_bwindow.h +++ b/jni/SDL2-2.0.4/src/video/haiku/SDL_bwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.c index ffb1e9e2..f9dfc039 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.h index 1dadfc6d..48bf489c 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirdyn.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirdyn.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.c index 8ff2cb3a..708f8ffd 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.h index 8caabc8a..3e0d9662 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirevents.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.c index d1821cc4..53e6056f 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.h index 328fb23d..22a579c0 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirframebuffer.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirframebuffer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.c index 740ac20e..bb8dc6c4 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.h index 700cc699..94dd0856 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirmouse.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirmouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.c b/jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.c index b7c7ae80..23fabb26 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.h b/jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.h index 5a04ac8a..96bb40a6 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_miropengl.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_miropengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirsym.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirsym.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirsym.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirsym.h index 415df0c9..d0aaf70a 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirsym.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirsym.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.c index 176e9a12..b6160fd9 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.h index 8db90b52..c5ef4758 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirvideo.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.c b/jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.c rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.c index 513dbe24..0eb54be0 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.c +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.h b/jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.h rename to jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.h index 577dfa41..c21fc929 100644 --- a/jni/SDL2-2.0.3/src/video/mir/SDL_mirwindow.h +++ b/jni/SDL2-2.0.4/src/video/mir/SDL_mirwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents.c b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents.c rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents.c index c552abb8..d6ebbdf8 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents.c +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents_c.h b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents_c.h rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents_c.h index 5fa6f991..3255578c 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclevents_c.h +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclglue.c b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclglue.c similarity index 94% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclglue.c rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclglue.c index 127494e9..79f5b0f9 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclglue.c +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclglue.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.c b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.c rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.c index 349d4bbd..e1124513 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.c +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.h b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.h rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.h index bcbca7db..1845e819 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclopengles.h +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.c b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.c rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.c index e9d014c8..467155c6 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.c +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.h b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.h rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.h index d9dc1630..174a6e77 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclvideo.h +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.c b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.c rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.c index 73c70337..32d1e6d7 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.c +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.h b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.h rename to jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.h index 3d6f375b..617bfc3a 100644 --- a/jni/SDL2-2.0.3/src/video/nacl/SDL_naclwindow.h +++ b/jni/SDL2-2.0.4/src/video/nacl/SDL_naclwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.c b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.c rename to jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.c index 2a0f4dcc..d1c35a70 100644 --- a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.c +++ b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.h b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.h rename to jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.h index 2dbbb2a9..b95cd10b 100644 --- a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora.h +++ b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.c b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.c rename to jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.c index f42e0b71..d22d0c75 100644 --- a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.c +++ b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.h b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.h rename to jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.h index c4313779..e9f8d7cf 100644 --- a/jni/SDL2-2.0.3/src/video/pandora/SDL_pandora_events.h +++ b/jni/SDL2-2.0.4/src/video/pandora/SDL_pandora_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspevents.c b/jni/SDL2-2.0.4/src/video/psp/SDL_pspevents.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspevents.c rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspevents.c index 7117b50a..c1a095db 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspevents.c +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspevents_c.h b/jni/SDL2-2.0.4/src/video/psp/SDL_pspevents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspevents_c.h rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspevents_c.h index 9e24b6ba..e1929d23 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspevents_c.h +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspgl.c b/jni/SDL2-2.0.4/src/video/psp/SDL_pspgl.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspgl.c rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspgl.c index f0fa7c3f..e4f81e9e 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspgl.c +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspgl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspgl_c.h b/jni/SDL2-2.0.4/src/video/psp/SDL_pspgl_c.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspgl_c.h rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspgl_c.h index 03b7a8c2..308b0272 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspgl_c.h +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspgl_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse.c b/jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse.c rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse.c index 14c69dee..b7c3d2b9 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse.c +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse_c.h b/jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse_c.h similarity index 93% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse_c.h rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse_c.h index de5ff4ef..2a3df68e 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspmouse_c.h +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspmouse_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.c b/jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.c rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.c index cfcf0cff..95566687 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.c +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.h b/jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.h rename to jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.h index e468c2dd..f5705a94 100644 --- a/jni/SDL2-2.0.3/src/video/psp/SDL_pspvideo.h +++ b/jni/SDL2-2.0.4/src/video/psp/SDL_pspvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents.c b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents.c rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents.c index 12760a86..4104568c 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents.c +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents_c.h b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents_c.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents_c.h rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents_c.h index adc2fdd7..54fc196e 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpievents_c.h +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpievents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.c b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.c rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.c index f8ee4ec6..0d1482c0 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.c +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.h b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.h rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.h index db8df76f..6a4e7051 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpimouse.h +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpimouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.c b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.c rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.c index 4809c925..0881dbde 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.c +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.h b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.h rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.h index 5dda45d5..83c80006 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpiopengles.h +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpiopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.c b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.c rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.c index fae9143b..539c88c9 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.c +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.h b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.h rename to jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.h index 648254c8..74dcf941 100644 --- a/jni/SDL2-2.0.3/src/video/raspberry/SDL_rpivideo.h +++ b/jni/SDL2-2.0.4/src/video/raspberry/SDL_rpivideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/sdlgenblit.pl b/jni/SDL2-2.0.4/src/video/sdlgenblit.pl similarity index 99% rename from jni/SDL2-2.0.3/src/video/sdlgenblit.pl rename to jni/SDL2-2.0.4/src/video/sdlgenblit.pl index 202c6c22..9ebffafc 100755 --- a/jni/SDL2-2.0.3/src/video/sdlgenblit.pl +++ b/jni/SDL2-2.0.4/src/video/sdlgenblit.pl @@ -92,7 +92,7 @@ sub open_file { /* DO NOT EDIT! This file is generated by sdlgenblit.pl */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.h index 9f3c9854..1879f0b3 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.m index 5d63019e..971b438b 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitappdelegate.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitappdelegate.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.h index 63eeb955..9b1d60c5 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.m similarity index 97% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.m index d4d6fcc4..1d7044d8 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitevents.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitevents.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.h index 2f38ac0d..52807241 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.m index 6c980d47..5778032a 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmessagebox.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmessagebox.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.h index 86bf3b2e..027cf7aa 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.m index afe6a957..98d03148 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitmodes.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitmodes.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.h index aa6bc75d..10697610 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.m index ef901247..a2ea4ab6 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopengles.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopengles.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.h index c710813d..86fb5e12 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.m index acfdb28f..60c247e6 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitopenglview.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitopenglview.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.h index 5eacd807..3fbaf92f 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.m similarity index 98% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.m index 3847de71..4f3c7dc4 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitvideo.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitvideo.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.h index 00be7657..18fa78f3 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.m index 4372cc20..1ccda98f 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitview.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitview.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.h index e8462b8e..c7839680 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.m index 112638eb..58cdf1ac 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitviewcontroller.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitviewcontroller.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.h b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.h rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.h index 987bbe01..ed08c55d 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.h +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.m b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.m similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.m rename to jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.m index 6826f825..c5f385b8 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/SDL_uikitwindow.m +++ b/jni/SDL2-2.0.4/src/video/uikit/SDL_uikitwindow.m @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/uikit/keyinfotable.h b/jni/SDL2-2.0.4/src/video/uikit/keyinfotable.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/uikit/keyinfotable.h rename to jni/SDL2-2.0.4/src/video/uikit/keyinfotable.h index 22a79dce..962dbd92 100644 --- a/jni/SDL2-2.0.3/src/video/uikit/keyinfotable.h +++ b/jni/SDL2-2.0.4/src/video/uikit/keyinfotable.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.c b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.c similarity index 96% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.c rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.c index 96d2f89d..687cc6a7 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.c +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.h b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.h rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.h index b7b61803..f47bf779 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteopengles.h +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.c b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.c rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.c index 40579dfa..76233417 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.c +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.h b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.h rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.h index b8376283..6e11cce6 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivanteplatform.h +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivanteplatform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.c b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.c rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.c index 8095cb58..fe4ea089 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.c +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.h b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.h rename to jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.h index 030516bd..b99c7337 100644 --- a/jni/SDL2-2.0.3/src/video/vivante/SDL_vivantevideo.h +++ b/jni/SDL2-2.0.4/src/video/vivante/SDL_vivantevideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.c index edf6e219..bc1d06e4 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h index 19fd4558..b3ff9d8e 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylanddyn.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylanddyn.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents.c index face9d64..53b0ac90 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents_c.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents_c.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents_c.h index 5a914e90..62b163bf 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandevents_c.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.c index 2d78ebb9..b810f778 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.h index 3a914a28..129990de 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandmouse.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandmouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.c index ca301e57..6803dbe6 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.h index 42c13f84..6c3f1f38 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandsym.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandsym.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h index edac091f..b093d9db 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandsym.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandsym.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.c index 3aa8828d..4cae4259 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.h index 8c0d2036..5f2a0581 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandtouch.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandtouch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.c index f509ddc1..b47ec29b 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.h index 6dc736a2..8111bf15 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.c b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.c rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.c index e105408a..b59759a7 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.c +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.h b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.h rename to jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.h index e2bed546..053b1281 100644 --- a/jni/SDL2-2.0.3/src/video/wayland/SDL_waylandwindow.h +++ b/jni/SDL2-2.0.4/src/video/wayland/SDL_waylandwindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_msctf.h b/jni/SDL2-2.0.4/src/video/windows/SDL_msctf.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_msctf.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_msctf.h index c2368d7a..74e22f10 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_msctf.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_msctf.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_vkeys.h b/jni/SDL2-2.0.4/src/video/windows/SDL_vkeys.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/windows/SDL_vkeys.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_vkeys.h index 4c3d390d..fd652041 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_vkeys.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_vkeys.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.c index d93eceed..b57a66a7 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.h index 3b5e62b4..d86cd97e 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsclipboard.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsclipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.c index 3ce8291d..61420894 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -415,12 +415,19 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) * FIXME: Update keyboard state */ WIN_CheckClipboardUpdate(data->videodata); + + SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0); + SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0); } else { + data->in_window_deactivation = SDL_TRUE; + if (SDL_GetKeyboardFocus() == data->window) { SDL_SetKeyboardFocus(NULL); } ClipCursor(NULL); + + data->in_window_deactivation = SDL_FALSE; } } returnCode = 0; diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.h index 3e923aab..dcd3118a 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsevents.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsevents.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.c similarity index 97% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.c index d92a5a1b..7bb07ed2 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,6 +42,9 @@ int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, voi /* Find out the format of the screen */ size = sizeof(BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD); info = (LPBITMAPINFO)SDL_stack_alloc(Uint8, size); + if (!info) { + return SDL_OutOfMemory(); + } SDL_memset(info, 0, size); info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.h index ed6837ba..0c825f9d 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsframebuffer.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsframebuffer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.c index d56f4042..d3e16c8b 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -102,6 +102,10 @@ WIN_InitKeyboard(_THIS) SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu"); SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Windows"); SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Windows"); + + /* Are system caps/num/scroll lock active? Set our state to match. */ + SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0); + SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0); } void diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.h index 5967b511..d330d387 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowskeyboard.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowskeyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.c index ac4a3a5a..b39df32f 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.h index 37f9f4cb..e9c69254 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmessagebox.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmessagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.c index 7cb4ea5b..91ed67f8 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.h index 2bf9f4c8..e725848b 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmodes.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmodes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.c index 69aa7771..72d7892d 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.h index d3d8f634..60672e6b 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsmouse.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsmouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.c similarity index 96% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.c index dc8cbb8a..d30d838f 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -666,29 +666,29 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window) WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, 0 }; - int iattr = 4; + int iattr = 4; - /* SDL profile bits match WGL profile bits */ - if( _this->gl_config.profile_mask != 0 ) { - attribs[iattr++] = WGL_CONTEXT_PROFILE_MASK_ARB; - attribs[iattr++] = _this->gl_config.profile_mask; - } + /* SDL profile bits match WGL profile bits */ + if (_this->gl_config.profile_mask != 0) { + attribs[iattr++] = WGL_CONTEXT_PROFILE_MASK_ARB; + attribs[iattr++] = _this->gl_config.profile_mask; + } - /* SDL flags match WGL flags */ - if( _this->gl_config.flags != 0 ) { - attribs[iattr++] = WGL_CONTEXT_FLAGS_ARB; - attribs[iattr++] = _this->gl_config.flags; - } + /* SDL flags match WGL flags */ + if (_this->gl_config.flags != 0) { + attribs[iattr++] = WGL_CONTEXT_FLAGS_ARB; + attribs[iattr++] = _this->gl_config.flags; + } - /* only set if wgl extension is available */ - if( _this->gl_data->HAS_WGL_ARB_context_flush_control ) { - attribs[iattr++] = WGL_CONTEXT_RELEASE_BEHAVIOR_ARB; - attribs[iattr++] = _this->gl_config.release_behavior ? + /* only set if wgl extension is available */ + if (_this->gl_data->HAS_WGL_ARB_context_flush_control) { + attribs[iattr++] = WGL_CONTEXT_RELEASE_BEHAVIOR_ARB; + attribs[iattr++] = _this->gl_config.release_behavior ? WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB : WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB; - } + } - attribs[iattr++] = 0; + attribs[iattr++] = 0; /* Create the GL 3.x context */ context = wglCreateContextAttribsARB(hdc, share_context, attribs); diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.h index 71c05db0..7b95cc8d 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengl.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.c index 9125da0e..f66cc088 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.h index f6342088..dbdf5f6a 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsopengles.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.c index 6c38ba1a..0a50985a 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.h index 568945c7..ddd8f49b 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsshape.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsshape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.c index 86c3437c..37199805 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.h index 85327a7a..912d8763 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowsvideo.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowsvideo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.c b/jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.c similarity index 96% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.c rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.c index 70e80a95..26683a0e 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.c +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -559,7 +559,25 @@ WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, y = bounds.y; w = bounds.w; h = bounds.h; + + /* Unset the maximized flag. This fixes + https://bugzilla.libsdl.org/show_bug.cgi?id=3215 + */ + if (style & WS_MAXIMIZE) { + data->windowed_mode_was_maximized = SDL_TRUE; + style &= ~WS_MAXIMIZE; + } } else { + /* Restore window-maximization state, as applicable. + Special care is taken to *not* do this if and when we're + alt-tab'ing away (to some other window; as indicated by + in_window_deactivation), otherwise + https://bugzilla.libsdl.org/show_bug.cgi?id=3215 can reproduce! + */ + if (data->windowed_mode_was_maximized && !data->in_window_deactivation) { + style |= WS_MAXIMIZE; + data->windowed_mode_was_maximized = SDL_FALSE; + } rect.left = 0; rect.top = 0; rect.right = window->windowed.w; diff --git a/jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.h b/jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.h rename to jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.h index 6b8b0c2d..f91aa0ed 100644 --- a/jni/SDL2-2.0.3/src/video/windows/SDL_windowswindow.h +++ b/jni/SDL2-2.0.4/src/video/windows/SDL_windowswindow.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -42,6 +42,8 @@ typedef struct SDL_bool in_border_change; SDL_bool in_title_click; SDL_bool focus_click_pending; + SDL_bool windowed_mode_was_maximized; + SDL_bool in_window_deactivation; struct SDL_VideoData *videodata; #if SDL_VIDEO_OPENGL_EGL EGLSurface egl_surface; diff --git a/jni/SDL2-2.0.3/src/video/windows/wmmsg.h b/jni/SDL2-2.0.4/src/video/windows/wmmsg.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/windows/wmmsg.h rename to jni/SDL2-2.0.4/src/video/windows/wmmsg.h index e8f65ac3..8c1351fe 100644 --- a/jni/SDL2-2.0.3/src/video/windows/wmmsg.h +++ b/jni/SDL2-2.0.4/src/video/windows/wmmsg.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents.cpp index 5c779d3c..e9df726d 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents_c.h b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents_c.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents_c.h rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents_c.h index 047be740..dc94526b 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtevents_c.h +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtevents_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtkeyboard.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtkeyboard.cpp similarity index 99% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtkeyboard.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtkeyboard.cpp index f75dd5f9..7477cdee 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtkeyboard.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtkeyboard.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.cpp index dc38d214..ca958107 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.h b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.h rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.h index 8cae479a..4184aa5e 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmessagebox.h +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmessagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse.cpp similarity index 98% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse.cpp index cfebe9e0..d3140a4a 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse_c.h b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse_c.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse_c.h rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse_c.h index f97af04d..464ba4d4 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtmouse_c.h +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtmouse_c.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.cpp similarity index 99% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.cpp index 04c61ab9..cca07fa1 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.h b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.h rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.h index a0fde81a..1da757b6 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtopengles.h +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtopengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtpointerinput.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtpointerinput.cpp similarity index 99% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtpointerinput.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtpointerinput.cpp index 2bd3adf2..1d648f96 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtpointerinput.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtpointerinput.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo.cpp b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo.cpp similarity index 82% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo.cpp rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo.cpp index 726a5347..9d7c1cce 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo.cpp +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo.cpp @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -315,6 +315,61 @@ WINRT_AddDisplaysForAdapter (_THIS, IDXGIFactory2 * dxgiFactory2, int adapterInd for (int outputIndex = 0; ; ++outputIndex) { if (WINRT_AddDisplaysForOutput(_this, dxgiAdapter1, outputIndex) < 0) { + /* HACK: The Windows App Certification Kit 10.0 can fail, when + running the Store Apps' test, "Direct3D Feature Test". The + certification kit's error is: + + "Application App was not running at the end of the test. It likely crashed or was terminated for having become unresponsive." + + This was caused by SDL/WinRT's DXGI failing to report any + outputs. Attempts to get the 1st display-output from the + 1st display-adapter can fail, with IDXGIAdapter::EnumOutputs + returning DXGI_ERROR_NOT_FOUND. This could be a bug in Windows, + the Windows App Certification Kit, or possibly in SDL/WinRT's + display detection code. Either way, try to detect when this + happens, and use a hackish means to create a reasonable-as-possible + 'display mode'. -- DavidL + */ + if (adapterIndex == 0 && outputIndex == 0) { + SDL_VideoDisplay display; + SDL_DisplayMode mode; +#if SDL_WINRT_USE_APPLICATIONVIEW + ApplicationView ^ appView = ApplicationView::GetForCurrentView(); +#endif + CoreWindow ^ coreWin = CoreWindow::GetForCurrentThread(); + SDL_zero(display); + SDL_zero(mode); + display.name = "DXGI Display-detection Workaround"; + + /* HACK: ApplicationView's VisibleBounds property, appeared, via testing, to + give a better approximation of display-size, than did CoreWindow's + Bounds property, insofar that ApplicationView::VisibleBounds seems like + it will, at least some of the time, give the full display size (during the + failing test), whereas CoreWindow might not. -- DavidL + */ + +#if (NTDDI_VERSION >= NTDDI_WIN10) || (SDL_WINRT_USE_APPLICATIONVIEW && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) + mode.w = WINRT_DIPS_TO_PHYSICAL_PIXELS(appView->VisibleBounds.Width); + mode.h = WINRT_DIPS_TO_PHYSICAL_PIXELS(appView->VisibleBounds.Height); +#else + /* On platform(s) that do not support VisibleBounds, such as Windows 8.1, + fall back to CoreWindow's Bounds property. + */ + mode.w = WINRT_DIPS_TO_PHYSICAL_PIXELS(coreWin->Bounds.Width); + mode.h = WINRT_DIPS_TO_PHYSICAL_PIXELS(coreWin->Bounds.Height); +#endif + + mode.format = DXGI_FORMAT_B8G8R8A8_UNORM; + mode.refresh_rate = 0; /* Display mode is unknown, so just fill in zero, as specified by SDL's header files */ + display.desktop_mode = mode; + display.current_mode = mode; + if ((SDL_AddDisplayMode(&display, &mode) < 0) || + (SDL_AddVideoDisplay(&display) < 0)) + { + return SDL_SetError("Failed to apply DXGI Display-detection workaround"); + } + } + break; } } @@ -341,7 +396,6 @@ WINRT_InitModes(_THIS) return -1; } - int adapterIndex = 0; for (int adapterIndex = 0; ; ++adapterIndex) { if (WINRT_AddDisplaysForAdapter(_this, dxgiFactory2, adapterIndex) < 0) { break; @@ -438,6 +492,7 @@ WINRT_DetectWindowFlags(SDL_Window * window) return latestFlags; } +// TODO, WinRT: consider removing WINRT_UpdateWindowFlags, and just calling WINRT_DetectWindowFlags as-appropriate (with appropriate calls to SDL_SendWindowEvent) void WINRT_UpdateWindowFlags(SDL_Window * window, Uint32 mask) { @@ -451,6 +506,32 @@ WINRT_UpdateWindowFlags(SDL_Window * window, Uint32 mask) } } +static bool +WINRT_IsCoreWindowActive(CoreWindow ^ coreWindow) +{ + /* WinRT does not appear to offer API(s) to determine window-activation state, + at least not that I am aware of in Win8 - Win10. As such, SDL tracks this + itself, via window-activation events. + + If there *is* an API to track this, it should probably get used instead + of the following hack (that uses "SDLHelperWindowActivationState"). + -- DavidL. + */ + if (coreWindow->CustomProperties->HasKey("SDLHelperWindowActivationState")) { + CoreWindowActivationState activationState = \ + safe_cast(coreWindow->CustomProperties->Lookup("SDLHelperWindowActivationState")); + return (activationState != CoreWindowActivationState::Deactivated); + } + + /* Assume that non-SDL tracked windows are active, although this should + probably be avoided, if possible. + + This might not even be possible, in normal SDL use, at least as of + this writing (Dec 22, 2015; via latest hg.libsdl.org/SDL clone) -- DavidL + */ + return true; +} + int WINRT_CreateWindow(_THIS, SDL_Window * window) { @@ -591,12 +672,7 @@ WINRT_CreateWindow(_THIS, SDL_Window * window) ); /* Try detecting if the window is active */ - bool isWindowActive = true; /* Presume the window is active, unless we've been told otherwise */ - if (data->coreWindow->CustomProperties->HasKey("SDLHelperWindowActivationState")) { - CoreWindowActivationState activationState = \ - safe_cast(data->coreWindow->CustomProperties->Lookup("SDLHelperWindowActivationState")); - isWindowActive = (activationState != CoreWindowActivationState::Deactivated); - } + bool isWindowActive = WINRT_IsCoreWindowActive(data->coreWindow.Get()); if (isWindowActive) { SDL_SetKeyboardFocus(window); } @@ -627,13 +703,16 @@ WINRT_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display { #if NTDDI_VERSION >= NTDDI_WIN10 SDL_WindowData * data = (SDL_WindowData *)window->driverdata; - if (fullscreen) { - if (!data->appView->IsFullScreenMode) { - data->appView->TryEnterFullScreenMode(); // TODO, WinRT: return failure (to caller?) from TryEnterFullScreenMode() - } - } else { - if (data->appView->IsFullScreenMode) { - data->appView->ExitFullScreenMode(); + bool isWindowActive = WINRT_IsCoreWindowActive(data->coreWindow.Get()); + if (isWindowActive) { + if (fullscreen) { + if (!data->appView->IsFullScreenMode) { + data->appView->TryEnterFullScreenMode(); // TODO, WinRT: return failure (to caller?) from TryEnterFullScreenMode() + } + } else { + if (data->appView->IsFullScreenMode) { + data->appView->ExitFullScreenMode(); + } } } #endif diff --git a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo_cpp.h b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo_cpp.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo_cpp.h rename to jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo_cpp.h index 84f75a6c..26eb008d 100644 --- a/jni/SDL2-2.0.3/src/video/winrt/SDL_winrtvideo_cpp.h +++ b/jni/SDL2-2.0.4/src/video/winrt/SDL_winrtvideo_cpp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.c index eca40f2a..34c0a71c 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.h index 09dcf568..15dae7df 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11clipboard.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.c index 58e97be7..7cbfa3e9 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.h index 2d729b70..136609b8 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11dyn.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11dyn.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11events.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11events.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11events.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11events.c index 2f730c44..20800960 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11events.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11events.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -348,27 +348,10 @@ X11_ReconcileKeyboardState(_THIS) X11_XQueryKeymap(display, keys); - /* Get the keyboard modifier state */ + /* Sync up the keyboard modifier state */ if (X11_XQueryPointer(display, DefaultRootWindow(display), &junk_window, &junk_window, &x, &y, &x, &y, &mask)) { - unsigned num_mask = X11_GetNumLockModifierMask(_this); - const Uint8 *keystate = SDL_GetKeyboardState(NULL); - Uint8 capslockState = keystate[SDL_SCANCODE_CAPSLOCK]; - Uint8 numlockState = keystate[SDL_SCANCODE_NUMLOCKCLEAR]; - - /* Toggle key mod state if needed */ - if (!!(mask & LockMask) != !!(SDL_GetModState() & KMOD_CAPS)) { - SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK); - if (capslockState == SDL_RELEASED) { - SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK); - } - } - - if (!!(mask & num_mask) != !!(SDL_GetModState() & KMOD_NUM)) { - SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_NUMLOCKCLEAR); - if (numlockState == SDL_RELEASED) { - SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_NUMLOCKCLEAR); - } - } + SDL_ToggleModState(KMOD_CAPS, (mask & LockMask) != 0); + SDL_ToggleModState(KMOD_NUM, (mask & X11_GetNumLockModifierMask(_this)) != 0); } for (keycode = 0; keycode < 256; ++keycode) { diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11events.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11events.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11events.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11events.h index a6d434de..024fca3f 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11events.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.c index 90a4a6fc..a4886169 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.h index 359ee157..7326e7da 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11framebuffer.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11framebuffer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.c index b04830f1..2c3acdad 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.h similarity index 95% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.h index 1e9c48ca..a1102ed7 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11keyboard.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.c index a52d4c9e..fc8b1b26 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.h index 37d8312c..c77c57fb 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11messagebox.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.c index d3f8874b..446da2b6 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -376,8 +376,7 @@ X11_InitModes_XRandR(_THIS) for (screen = 0; screen < screencount; screen++) { /* we want the primary output first, and then skipped later. */ - if ((looking_for_primary && (screen != default_screen)) || - (!looking_for_primary && (screen == default_screen))) { + if (looking_for_primary && (screen != default_screen)) { continue; } @@ -421,7 +420,7 @@ X11_InitModes_XRandR(_THIS) XRRCrtcInfo *crtc; /* The primary output _should_ always be sorted first, but just in case... */ - if ((looking_for_primary && ((screen != default_screen) || (res->outputs[output] != primary))) || + if ((looking_for_primary && (res->outputs[output] != primary)) || (!looking_for_primary && (screen == default_screen) && (res->outputs[output] == primary))) { continue; } @@ -491,11 +490,11 @@ X11_InitModes_XRandR(_THIS) display.driverdata = displaydata; SDL_AddVideoDisplay(&display); } + + X11_XRRFreeScreenResources(res); } } - X11_XRRFreeScreenResources(res); - if (_this->num_displays == 0) { return SDL_SetError("No available displays"); } diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.h index 769da5a5..a68286ab 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11modes.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11modes.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.c index 6cef0a4e..245b116e 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.h index 7c6a5443..d31d6b72 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11mouse.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.c index a431ae74..8b634be3 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.h similarity index 97% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.h index de229735..86e77d7d 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengl.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.c index ca57af38..53117220 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.h index e39e3c01..716e6e68 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11opengles.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.c similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.c index 19c7942d..4f78ae89 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.h index 0d3c2107..cd88ab70 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11shape.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11sym.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11sym.h similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11sym.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11sym.h index 4a926a34..3683ac0a 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11sym.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11sym.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.c similarity index 95% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.c index 2b24027a..c19e80a6 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.h similarity index 94% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.h index 47645e8f..7f8d18e1 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11touch.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11video.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11video.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11video.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11video.c index 9d07438e..01f8ae60 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11video.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11video.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11video.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11video.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11video.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11video.h index a544113e..2083defd 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11video.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11window.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11window.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11window.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11window.c index b9505611..afc80219 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11window.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11window.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11window.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11window.h similarity index 98% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11window.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11window.h index a3424ff6..efe7ec0f 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11window.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11window.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.c b/jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.c similarity index 99% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.c rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.c index c74e027c..57132fe9 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.c +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.c @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.h b/jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.h similarity index 96% rename from jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.h rename to jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.h index 06d3c990..ed8dd1a4 100644 --- a/jni/SDL2-2.0.3/src/video/x11/SDL_x11xinput2.h +++ b/jni/SDL2-2.0.4/src/video/x11/SDL_x11xinput2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/src/video/x11/edid-parse.c b/jni/SDL2-2.0.4/src/video/x11/edid-parse.c similarity index 100% rename from jni/SDL2-2.0.3/src/video/x11/edid-parse.c rename to jni/SDL2-2.0.4/src/video/x11/edid-parse.c diff --git a/jni/SDL2-2.0.3/src/video/x11/edid.h b/jni/SDL2-2.0.4/src/video/x11/edid.h similarity index 100% rename from jni/SDL2-2.0.3/src/video/x11/edid.h rename to jni/SDL2-2.0.4/src/video/x11/edid.h diff --git a/jni/SDL2-2.0.3/src/video/x11/imKStoUCS.c b/jni/SDL2-2.0.4/src/video/x11/imKStoUCS.c similarity index 100% rename from jni/SDL2-2.0.3/src/video/x11/imKStoUCS.c rename to jni/SDL2-2.0.4/src/video/x11/imKStoUCS.c diff --git a/jni/SDL2-2.0.3/src/video/x11/imKStoUCS.h b/jni/SDL2-2.0.4/src/video/x11/imKStoUCS.h similarity index 100% rename from jni/SDL2-2.0.3/src/video/x11/imKStoUCS.h rename to jni/SDL2-2.0.4/src/video/x11/imKStoUCS.h diff --git a/jni/SDL2-2.0.3/test/COPYING b/jni/SDL2-2.0.4/test/COPYING similarity index 100% rename from jni/SDL2-2.0.3/test/COPYING rename to jni/SDL2-2.0.4/test/COPYING diff --git a/jni/SDL2-2.0.3/test/Makefile.in b/jni/SDL2-2.0.4/test/Makefile.in similarity index 100% rename from jni/SDL2-2.0.3/test/Makefile.in rename to jni/SDL2-2.0.4/test/Makefile.in diff --git a/jni/SDL2-2.0.3/test/README b/jni/SDL2-2.0.4/test/README similarity index 93% rename from jni/SDL2-2.0.3/test/README rename to jni/SDL2-2.0.4/test/README index 179b28a4..f6282be3 100644 --- a/jni/SDL2-2.0.3/test/README +++ b/jni/SDL2-2.0.4/test/README @@ -5,11 +5,9 @@ These are test programs for the SDL library: loopwave Audio test -- loop playing a WAV file loopwavequeue Audio test -- loop playing a WAV file with SDL_QueueAudio testaudioinfo Lists audio device capabilities - testcdrom Sample audio CD control program testerror Tests multi-threaded error handling testfile Tests RWops layer testgl2 A very simple example of using OpenGL with SDL - testhread Hacked up test of multi-threading testiconv Tests international string conversion testjoystick List joysticks and watch joystick events testkeys List the available keyboard keys @@ -17,11 +15,11 @@ These are test programs for the SDL library: testlock Hacked up test of multi-threading and locking testmultiaudio Tests using several audio devices testoverlay2 Tests the overlay flickering/scaling during playback. - testpalette Tests palette color cycling testplatform Tests types, endianness and cpu capabilities testsem Tests SDL's semaphore implementation testshape Tests shaped windows testsprite2 Example of fast sprite movement on the screen + testthread Hacked up test of multi-threading testtimer Test the timer facilities testver Check the version and dynamic loading and endianness testwm2 Test window manager -- title, icon, events diff --git a/jni/SDL2-2.0.3/test/acinclude.m4 b/jni/SDL2-2.0.4/test/acinclude.m4 similarity index 100% rename from jni/SDL2-2.0.3/test/acinclude.m4 rename to jni/SDL2-2.0.4/test/acinclude.m4 diff --git a/jni/SDL2-2.0.3/test/aclocal.m4 b/jni/SDL2-2.0.4/test/aclocal.m4 similarity index 100% rename from jni/SDL2-2.0.3/test/aclocal.m4 rename to jni/SDL2-2.0.4/test/aclocal.m4 diff --git a/jni/SDL2-2.0.3/test/autogen.sh b/jni/SDL2-2.0.4/test/autogen.sh similarity index 100% rename from jni/SDL2-2.0.3/test/autogen.sh rename to jni/SDL2-2.0.4/test/autogen.sh diff --git a/jni/SDL2-2.0.3/test/axis.bmp b/jni/SDL2-2.0.4/test/axis.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/axis.bmp rename to jni/SDL2-2.0.4/test/axis.bmp diff --git a/jni/SDL2-2.0.3/test/button.bmp b/jni/SDL2-2.0.4/test/button.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/button.bmp rename to jni/SDL2-2.0.4/test/button.bmp diff --git a/jni/SDL2-2.0.3/test/checkkeys.c b/jni/SDL2-2.0.4/test/checkkeys.c similarity index 98% rename from jni/SDL2-2.0.3/test/checkkeys.c rename to jni/SDL2-2.0.4/test/checkkeys.c index 0b51f388..771369fa 100644 --- a/jni/SDL2-2.0.3/test/checkkeys.c +++ b/jni/SDL2-2.0.4/test/checkkeys.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/configure b/jni/SDL2-2.0.4/test/configure similarity index 100% rename from jni/SDL2-2.0.3/test/configure rename to jni/SDL2-2.0.4/test/configure diff --git a/jni/SDL2-2.0.3/test/configure.in b/jni/SDL2-2.0.4/test/configure.in similarity index 100% rename from jni/SDL2-2.0.3/test/configure.in rename to jni/SDL2-2.0.4/test/configure.in diff --git a/jni/SDL2-2.0.3/test/controllermap.bmp b/jni/SDL2-2.0.4/test/controllermap.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/controllermap.bmp rename to jni/SDL2-2.0.4/test/controllermap.bmp diff --git a/jni/SDL2-2.0.3/test/controllermap.c b/jni/SDL2-2.0.4/test/controllermap.c similarity index 98% rename from jni/SDL2-2.0.3/test/controllermap.c rename to jni/SDL2-2.0.4/test/controllermap.c index eca82c37..3fb30d68 100644 --- a/jni/SDL2-2.0.3/test/controllermap.c +++ b/jni/SDL2-2.0.4/test/controllermap.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -232,7 +232,7 @@ WatchJoystick(SDL_Joystick * joystick) if (SDL_PollEvent(&event)) { switch (event.type) { case SDL_JOYAXISMOTION: - if (event.jaxis.value > 20000 || event.jaxis.value < -20000) { + if ((event.jaxis.value > 20000 || event.jaxis.value < -20000) && event.jaxis.value != -32768) { for (_s = 0; _s < s; _s++) { if (steps[_s].axis == event.jaxis.axis) { break; diff --git a/jni/SDL2-2.0.3/test/gcc-fat.sh b/jni/SDL2-2.0.4/test/gcc-fat.sh similarity index 100% rename from jni/SDL2-2.0.3/test/gcc-fat.sh rename to jni/SDL2-2.0.4/test/gcc-fat.sh diff --git a/jni/SDL2-2.0.3/test/icon.bmp b/jni/SDL2-2.0.4/test/icon.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/icon.bmp rename to jni/SDL2-2.0.4/test/icon.bmp diff --git a/jni/SDL2-2.0.3/test/loopwave.c b/jni/SDL2-2.0.4/test/loopwave.c similarity index 96% rename from jni/SDL2-2.0.3/test/loopwave.c rename to jni/SDL2-2.0.4/test/loopwave.c index 1e98f4ba..ec9f5281 100644 --- a/jni/SDL2-2.0.3/test/loopwave.c +++ b/jni/SDL2-2.0.4/test/loopwave.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -10,7 +10,7 @@ freely. */ -/* Program to load a wave file and loop playing it using SDL sound */ +/* Program to load a wave file and loop playing it using SDL audio */ /* loopwaves.c is much more robust in handling WAVE files -- This is only for simple WAVEs diff --git a/jni/SDL2-2.0.3/test/loopwavequeue.c b/jni/SDL2-2.0.4/test/loopwavequeue.c similarity index 98% rename from jni/SDL2-2.0.3/test/loopwavequeue.c rename to jni/SDL2-2.0.4/test/loopwavequeue.c index 2794c723..85f5bd57 100644 --- a/jni/SDL2-2.0.3/test/loopwavequeue.c +++ b/jni/SDL2-2.0.4/test/loopwavequeue.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/moose.dat b/jni/SDL2-2.0.4/test/moose.dat similarity index 100% rename from jni/SDL2-2.0.3/test/moose.dat rename to jni/SDL2-2.0.4/test/moose.dat diff --git a/jni/SDL2-2.0.3/test/nacl/Makefile b/jni/SDL2-2.0.4/test/nacl/Makefile similarity index 100% rename from jni/SDL2-2.0.3/test/nacl/Makefile rename to jni/SDL2-2.0.4/test/nacl/Makefile diff --git a/jni/SDL2-2.0.3/test/nacl/background.js b/jni/SDL2-2.0.4/test/nacl/background.js similarity index 100% rename from jni/SDL2-2.0.3/test/nacl/background.js rename to jni/SDL2-2.0.4/test/nacl/background.js diff --git a/jni/SDL2-2.0.3/test/nacl/common.js b/jni/SDL2-2.0.4/test/nacl/common.js similarity index 100% rename from jni/SDL2-2.0.3/test/nacl/common.js rename to jni/SDL2-2.0.4/test/nacl/common.js diff --git a/jni/SDL2-2.0.3/test/nacl/index.html b/jni/SDL2-2.0.4/test/nacl/index.html similarity index 100% rename from jni/SDL2-2.0.3/test/nacl/index.html rename to jni/SDL2-2.0.4/test/nacl/index.html diff --git a/jni/SDL2-2.0.3/test/nacl/manifest.json b/jni/SDL2-2.0.4/test/nacl/manifest.json similarity index 100% rename from jni/SDL2-2.0.3/test/nacl/manifest.json rename to jni/SDL2-2.0.4/test/nacl/manifest.json diff --git a/jni/SDL2-2.0.3/test/picture.xbm b/jni/SDL2-2.0.4/test/picture.xbm similarity index 100% rename from jni/SDL2-2.0.3/test/picture.xbm rename to jni/SDL2-2.0.4/test/picture.xbm diff --git a/jni/SDL2-2.0.3/test/relative_mode.markdown b/jni/SDL2-2.0.4/test/relative_mode.markdown similarity index 100% rename from jni/SDL2-2.0.3/test/relative_mode.markdown rename to jni/SDL2-2.0.4/test/relative_mode.markdown diff --git a/jni/SDL2-2.0.3/test/sample.bmp b/jni/SDL2-2.0.4/test/sample.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/sample.bmp rename to jni/SDL2-2.0.4/test/sample.bmp diff --git a/jni/SDL2-2.0.3/test/sample.wav b/jni/SDL2-2.0.4/test/sample.wav similarity index 100% rename from jni/SDL2-2.0.3/test/sample.wav rename to jni/SDL2-2.0.4/test/sample.wav diff --git a/jni/SDL2-2.0.3/test/shapes/p01_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p01_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p01_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p01_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p01_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p01_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p01_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p01_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p01_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p01_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p01_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p01_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p02_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p02_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p02_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p02_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p02_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p02_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p02_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p02_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p02_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p02_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p02_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p02_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p03_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p03_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p03_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p03_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p03_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p03_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p03_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p03_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p04_shape1.bmp b/jni/SDL2-2.0.4/test/shapes/p04_shape1.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p04_shape1.bmp rename to jni/SDL2-2.0.4/test/shapes/p04_shape1.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p04_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p04_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p04_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p04_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p04_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p04_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p04_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p04_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p04_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p04_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p04_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p04_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p05_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p05_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p05_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p05_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p06_shape1alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p06_shape1alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p06_shape1alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p06_shape1alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p06_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p06_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p06_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p06_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p06_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p06_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p06_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p06_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p06_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p06_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p06_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p06_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p07_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p07_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p07_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p07_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p07_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p07_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p07_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p07_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p07_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p07_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p07_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p07_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p08_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p08_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p08_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p08_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p08_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p08_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p08_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p08_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p08_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p08_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p08_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p08_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p09_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p09_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p09_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p09_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p09_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p09_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p09_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p09_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p09_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p09_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p09_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p09_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p10_shape1.bmp b/jni/SDL2-2.0.4/test/shapes/p10_shape1.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p10_shape1.bmp rename to jni/SDL2-2.0.4/test/shapes/p10_shape1.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p10_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p10_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p10_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p10_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p10_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p10_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p10_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p10_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p10_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p10_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p10_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p10_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p11_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p11_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p11_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p11_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p11_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p11_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p11_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p11_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p11_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p11_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p11_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p11_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p12_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p12_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p12_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p12_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p12_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p12_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p12_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p12_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p13_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p13_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p13_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p13_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p13_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p13_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p13_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p13_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p13_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p13_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p13_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p13_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p14_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p14_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p14_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p14_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p14_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p14_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p14_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p14_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p15_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p15_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p15_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p15_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p15_shape32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/p15_shape32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p15_shape32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/p15_shape32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p15_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p15_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p15_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p15_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p16_shape1.bmp b/jni/SDL2-2.0.4/test/shapes/p16_shape1.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p16_shape1.bmp rename to jni/SDL2-2.0.4/test/shapes/p16_shape1.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p16_shape24.bmp b/jni/SDL2-2.0.4/test/shapes/p16_shape24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p16_shape24.bmp rename to jni/SDL2-2.0.4/test/shapes/p16_shape24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/p16_shape8.bmp b/jni/SDL2-2.0.4/test/shapes/p16_shape8.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/p16_shape8.bmp rename to jni/SDL2-2.0.4/test/shapes/p16_shape8.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/trollface_24.bmp b/jni/SDL2-2.0.4/test/shapes/trollface_24.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/trollface_24.bmp rename to jni/SDL2-2.0.4/test/shapes/trollface_24.bmp diff --git a/jni/SDL2-2.0.3/test/shapes/trollface_32alpha.bmp b/jni/SDL2-2.0.4/test/shapes/trollface_32alpha.bmp similarity index 100% rename from jni/SDL2-2.0.3/test/shapes/trollface_32alpha.bmp rename to jni/SDL2-2.0.4/test/shapes/trollface_32alpha.bmp diff --git a/jni/SDL2-2.0.3/test/testatomic.c b/jni/SDL2-2.0.4/test/testatomic.c similarity index 99% rename from jni/SDL2-2.0.3/test/testatomic.c rename to jni/SDL2-2.0.4/test/testatomic.c index 430213bb..41cc9ab1 100644 --- a/jni/SDL2-2.0.3/test/testatomic.c +++ b/jni/SDL2-2.0.4/test/testatomic.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testaudioinfo.c b/jni/SDL2-2.0.4/test/testaudioinfo.c similarity index 96% rename from jni/SDL2-2.0.3/test/testaudioinfo.c rename to jni/SDL2-2.0.4/test/testaudioinfo.c index cd95dc95..53bf0f5e 100644 --- a/jni/SDL2-2.0.3/test/testaudioinfo.c +++ b/jni/SDL2-2.0.4/test/testaudioinfo.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testautomation.c b/jni/SDL2-2.0.4/test/testautomation.c similarity index 98% rename from jni/SDL2-2.0.3/test/testautomation.c rename to jni/SDL2-2.0.4/test/testautomation.c index 34478a18..eea74b3b 100644 --- a/jni/SDL2-2.0.3/test/testautomation.c +++ b/jni/SDL2-2.0.4/test/testautomation.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testautomation_audio.c b/jni/SDL2-2.0.4/test/testautomation_audio.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_audio.c rename to jni/SDL2-2.0.4/test/testautomation_audio.c diff --git a/jni/SDL2-2.0.3/test/testautomation_clipboard.c b/jni/SDL2-2.0.4/test/testautomation_clipboard.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_clipboard.c rename to jni/SDL2-2.0.4/test/testautomation_clipboard.c diff --git a/jni/SDL2-2.0.3/test/testautomation_events.c b/jni/SDL2-2.0.4/test/testautomation_events.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_events.c rename to jni/SDL2-2.0.4/test/testautomation_events.c diff --git a/jni/SDL2-2.0.3/test/testautomation_hints.c b/jni/SDL2-2.0.4/test/testautomation_hints.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_hints.c rename to jni/SDL2-2.0.4/test/testautomation_hints.c diff --git a/jni/SDL2-2.0.3/test/testautomation_keyboard.c b/jni/SDL2-2.0.4/test/testautomation_keyboard.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_keyboard.c rename to jni/SDL2-2.0.4/test/testautomation_keyboard.c diff --git a/jni/SDL2-2.0.3/test/testautomation_main.c b/jni/SDL2-2.0.4/test/testautomation_main.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_main.c rename to jni/SDL2-2.0.4/test/testautomation_main.c diff --git a/jni/SDL2-2.0.3/test/testautomation_mouse.c b/jni/SDL2-2.0.4/test/testautomation_mouse.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_mouse.c rename to jni/SDL2-2.0.4/test/testautomation_mouse.c diff --git a/jni/SDL2-2.0.3/test/testautomation_pixels.c b/jni/SDL2-2.0.4/test/testautomation_pixels.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_pixels.c rename to jni/SDL2-2.0.4/test/testautomation_pixels.c diff --git a/jni/SDL2-2.0.3/test/testautomation_platform.c b/jni/SDL2-2.0.4/test/testautomation_platform.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_platform.c rename to jni/SDL2-2.0.4/test/testautomation_platform.c diff --git a/jni/SDL2-2.0.3/test/testautomation_rect.c b/jni/SDL2-2.0.4/test/testautomation_rect.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_rect.c rename to jni/SDL2-2.0.4/test/testautomation_rect.c diff --git a/jni/SDL2-2.0.3/test/testautomation_render.c b/jni/SDL2-2.0.4/test/testautomation_render.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_render.c rename to jni/SDL2-2.0.4/test/testautomation_render.c diff --git a/jni/SDL2-2.0.3/test/testautomation_rwops.c b/jni/SDL2-2.0.4/test/testautomation_rwops.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_rwops.c rename to jni/SDL2-2.0.4/test/testautomation_rwops.c diff --git a/jni/SDL2-2.0.3/test/testautomation_sdltest.c b/jni/SDL2-2.0.4/test/testautomation_sdltest.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_sdltest.c rename to jni/SDL2-2.0.4/test/testautomation_sdltest.c diff --git a/jni/SDL2-2.0.3/test/testautomation_stdlib.c b/jni/SDL2-2.0.4/test/testautomation_stdlib.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_stdlib.c rename to jni/SDL2-2.0.4/test/testautomation_stdlib.c diff --git a/jni/SDL2-2.0.3/test/testautomation_suites.h b/jni/SDL2-2.0.4/test/testautomation_suites.h similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_suites.h rename to jni/SDL2-2.0.4/test/testautomation_suites.h diff --git a/jni/SDL2-2.0.3/test/testautomation_surface.c b/jni/SDL2-2.0.4/test/testautomation_surface.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_surface.c rename to jni/SDL2-2.0.4/test/testautomation_surface.c diff --git a/jni/SDL2-2.0.3/test/testautomation_syswm.c b/jni/SDL2-2.0.4/test/testautomation_syswm.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_syswm.c rename to jni/SDL2-2.0.4/test/testautomation_syswm.c diff --git a/jni/SDL2-2.0.3/test/testautomation_timer.c b/jni/SDL2-2.0.4/test/testautomation_timer.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_timer.c rename to jni/SDL2-2.0.4/test/testautomation_timer.c diff --git a/jni/SDL2-2.0.3/test/testautomation_video.c b/jni/SDL2-2.0.4/test/testautomation_video.c similarity index 100% rename from jni/SDL2-2.0.3/test/testautomation_video.c rename to jni/SDL2-2.0.4/test/testautomation_video.c diff --git a/jni/SDL2-2.0.3/test/testdraw2.c b/jni/SDL2-2.0.4/test/testdraw2.c similarity index 99% rename from jni/SDL2-2.0.3/test/testdraw2.c rename to jni/SDL2-2.0.4/test/testdraw2.c index c3914260..77bd8c1f 100644 --- a/jni/SDL2-2.0.3/test/testdraw2.c +++ b/jni/SDL2-2.0.4/test/testdraw2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testdrawchessboard.c b/jni/SDL2-2.0.4/test/testdrawchessboard.c similarity index 98% rename from jni/SDL2-2.0.3/test/testdrawchessboard.c rename to jni/SDL2-2.0.4/test/testdrawchessboard.c index b34fc715..f2a1469d 100644 --- a/jni/SDL2-2.0.3/test/testdrawchessboard.c +++ b/jni/SDL2-2.0.4/test/testdrawchessboard.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testdropfile.c b/jni/SDL2-2.0.4/test/testdropfile.c similarity index 97% rename from jni/SDL2-2.0.3/test/testdropfile.c rename to jni/SDL2-2.0.4/test/testdropfile.c index 550e58e3..b7f215ee 100644 --- a/jni/SDL2-2.0.3/test/testdropfile.c +++ b/jni/SDL2-2.0.4/test/testdropfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testerror.c b/jni/SDL2-2.0.4/test/testerror.c similarity index 96% rename from jni/SDL2-2.0.3/test/testerror.c rename to jni/SDL2-2.0.4/test/testerror.c index 181ee11e..b5fa3fbc 100644 --- a/jni/SDL2-2.0.3/test/testerror.c +++ b/jni/SDL2-2.0.4/test/testerror.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testfile.c b/jni/SDL2-2.0.4/test/testfile.c similarity index 99% rename from jni/SDL2-2.0.3/test/testfile.c rename to jni/SDL2-2.0.4/test/testfile.c index e07b2fab..b45795f6 100644 --- a/jni/SDL2-2.0.3/test/testfile.c +++ b/jni/SDL2-2.0.4/test/testfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testfilesystem.c b/jni/SDL2-2.0.4/test/testfilesystem.c similarity index 83% rename from jni/SDL2-2.0.3/test/testfilesystem.c rename to jni/SDL2-2.0.4/test/testfilesystem.c index e1660c8d..abd301c0 100644 --- a/jni/SDL2-2.0.3/test/testfilesystem.c +++ b/jni/SDL2-2.0.4/test/testfilesystem.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -9,7 +9,7 @@ including commercial applications, and to alter it and redistribute it freely. */ -/* Simple test of power subsystem. */ +/* Simple test of filesystem functions. */ #include #include "SDL.h" @@ -17,6 +17,9 @@ int main(int argc, char *argv[]) { + char *base_path; + char *pref_path; + /* Enable standard application logging */ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); @@ -25,7 +28,7 @@ main(int argc, char *argv[]) return 1; } - char *base_path = SDL_GetBasePath(); + base_path = SDL_GetBasePath(); if(base_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find base path: %s\n", SDL_GetError()); @@ -35,7 +38,7 @@ main(int argc, char *argv[]) SDL_Log("base path: '%s'\n", base_path); SDL_free(base_path); - char *pref_path = SDL_GetPrefPath("libsdl", "testfilesystem"); + pref_path = SDL_GetPrefPath("libsdl", "testfilesystem"); if(pref_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find pref path: %s\n", SDL_GetError()); diff --git a/jni/SDL2-2.0.3/test/testgamecontroller.c b/jni/SDL2-2.0.4/test/testgamecontroller.c similarity index 99% rename from jni/SDL2-2.0.3/test/testgamecontroller.c rename to jni/SDL2-2.0.4/test/testgamecontroller.c index 688544ec..ec1dfd32 100644 --- a/jni/SDL2-2.0.3/test/testgamecontroller.c +++ b/jni/SDL2-2.0.4/test/testgamecontroller.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testgesture.c b/jni/SDL2-2.0.4/test/testgesture.c similarity index 99% rename from jni/SDL2-2.0.3/test/testgesture.c rename to jni/SDL2-2.0.4/test/testgesture.c index 5437c6c4..a289ce13 100644 --- a/jni/SDL2-2.0.3/test/testgesture.c +++ b/jni/SDL2-2.0.4/test/testgesture.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testgl2.c b/jni/SDL2-2.0.4/test/testgl2.c similarity index 99% rename from jni/SDL2-2.0.3/test/testgl2.c rename to jni/SDL2-2.0.4/test/testgl2.c index 449e02e4..74147f9f 100644 --- a/jni/SDL2-2.0.3/test/testgl2.c +++ b/jni/SDL2-2.0.4/test/testgl2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -59,7 +59,7 @@ static int LoadContext(GL_Context * data) return SDL_SetError("Couldn't load GL function %s: %s\n", #func, SDL_GetError()); \ } \ } while ( 0 ); -#endif /* _SDL_NOGETPROCADDR_ */ +#endif /* __SDL_NOGETPROCADDR__ */ #include "../src/render/opengl/SDL_glfuncs.h" #undef SDL_PROC diff --git a/jni/SDL2-2.0.3/test/testgles.c b/jni/SDL2-2.0.4/test/testgles.c similarity index 99% rename from jni/SDL2-2.0.3/test/testgles.c rename to jni/SDL2-2.0.4/test/testgles.c index b0b47c96..291661a0 100644 --- a/jni/SDL2-2.0.3/test/testgles.c +++ b/jni/SDL2-2.0.4/test/testgles.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testgles2.c b/jni/SDL2-2.0.4/test/testgles2.c similarity index 99% rename from jni/SDL2-2.0.3/test/testgles2.c rename to jni/SDL2-2.0.4/test/testgles2.c index f75bc157..af5962ba 100644 --- a/jni/SDL2-2.0.3/test/testgles2.c +++ b/jni/SDL2-2.0.4/test/testgles2.c @@ -1,5 +1,5 @@ /* - Copyright (r) 1997-2015 Sam Lantinga + Copyright (r) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,7 +61,7 @@ static int LoadContext(GLES2_Context * data) return SDL_SetError("Couldn't load GLES2 function %s: %s\n", #func, SDL_GetError()); \ } \ } while ( 0 ); -#endif /* _SDL_NOGETPROCADDR_ */ +#endif /* __SDL_NOGETPROCADDR__ */ #include "../src/render/opengles2/SDL_gles2funcs.h" #undef SDL_PROC diff --git a/jni/SDL2-2.0.3/test/testhaptic.c b/jni/SDL2-2.0.4/test/testhaptic.c similarity index 100% rename from jni/SDL2-2.0.3/test/testhaptic.c rename to jni/SDL2-2.0.4/test/testhaptic.c diff --git a/jni/SDL2-2.0.3/test/testhittesting.c b/jni/SDL2-2.0.4/test/testhittesting.c similarity index 100% rename from jni/SDL2-2.0.3/test/testhittesting.c rename to jni/SDL2-2.0.4/test/testhittesting.c diff --git a/jni/SDL2-2.0.3/test/testhotplug.c b/jni/SDL2-2.0.4/test/testhotplug.c similarity index 98% rename from jni/SDL2-2.0.3/test/testhotplug.c rename to jni/SDL2-2.0.4/test/testhotplug.c index 1de96f6d..1fa96375 100644 --- a/jni/SDL2-2.0.3/test/testhotplug.c +++ b/jni/SDL2-2.0.4/test/testhotplug.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testiconv.c b/jni/SDL2-2.0.4/test/testiconv.c similarity index 97% rename from jni/SDL2-2.0.3/test/testiconv.c rename to jni/SDL2-2.0.4/test/testiconv.c index 6576a87d..79efec8a 100644 --- a/jni/SDL2-2.0.3/test/testiconv.c +++ b/jni/SDL2-2.0.4/test/testiconv.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testime.c b/jni/SDL2-2.0.4/test/testime.c similarity index 98% rename from jni/SDL2-2.0.3/test/testime.c rename to jni/SDL2-2.0.4/test/testime.c index 4bddee17..d6e7ea1f 100644 --- a/jni/SDL2-2.0.3/test/testime.c +++ b/jni/SDL2-2.0.4/test/testime.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) { break; case SDLK_BACKSPACE: { - int textlen=SDL_strlen(text); + size_t textlen = SDL_strlen(text); do { if (textlen==0) diff --git a/jni/SDL2-2.0.3/test/testintersections.c b/jni/SDL2-2.0.4/test/testintersections.c similarity index 99% rename from jni/SDL2-2.0.3/test/testintersections.c rename to jni/SDL2-2.0.4/test/testintersections.c index d67b15e6..82aae633 100644 --- a/jni/SDL2-2.0.3/test/testintersections.c +++ b/jni/SDL2-2.0.4/test/testintersections.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testjoystick.c b/jni/SDL2-2.0.4/test/testjoystick.c similarity index 99% rename from jni/SDL2-2.0.3/test/testjoystick.c rename to jni/SDL2-2.0.4/test/testjoystick.c index 259b5a85..bed27212 100644 --- a/jni/SDL2-2.0.3/test/testjoystick.c +++ b/jni/SDL2-2.0.4/test/testjoystick.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testkeys.c b/jni/SDL2-2.0.4/test/testkeys.c similarity index 94% rename from jni/SDL2-2.0.3/test/testkeys.c rename to jni/SDL2-2.0.4/test/testkeys.c index 1c73df91..aea496ca 100644 --- a/jni/SDL2-2.0.3/test/testkeys.c +++ b/jni/SDL2-2.0.4/test/testkeys.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testloadso.c b/jni/SDL2-2.0.4/test/testloadso.c similarity index 97% rename from jni/SDL2-2.0.3/test/testloadso.c rename to jni/SDL2-2.0.4/test/testloadso.c index 8b4e4180..fb87fbed 100644 --- a/jni/SDL2-2.0.3/test/testloadso.c +++ b/jni/SDL2-2.0.4/test/testloadso.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testlock.c b/jni/SDL2-2.0.4/test/testlock.c similarity index 98% rename from jni/SDL2-2.0.3/test/testlock.c rename to jni/SDL2-2.0.4/test/testlock.c index 1293f958..1106ec3b 100644 --- a/jni/SDL2-2.0.3/test/testlock.c +++ b/jni/SDL2-2.0.4/test/testlock.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testmessage.c b/jni/SDL2-2.0.4/test/testmessage.c similarity index 98% rename from jni/SDL2-2.0.3/test/testmessage.c rename to jni/SDL2-2.0.4/test/testmessage.c index 2040e554..91968c32 100644 --- a/jni/SDL2-2.0.3/test/testmessage.c +++ b/jni/SDL2-2.0.4/test/testmessage.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testmultiaudio.c b/jni/SDL2-2.0.4/test/testmultiaudio.c similarity index 98% rename from jni/SDL2-2.0.3/test/testmultiaudio.c rename to jni/SDL2-2.0.4/test/testmultiaudio.c index d98ac945..117ef269 100644 --- a/jni/SDL2-2.0.3/test/testmultiaudio.c +++ b/jni/SDL2-2.0.4/test/testmultiaudio.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testnative.c b/jni/SDL2-2.0.4/test/testnative.c similarity index 99% rename from jni/SDL2-2.0.3/test/testnative.c rename to jni/SDL2-2.0.4/test/testnative.c index 0861bc98..049c4c83 100644 --- a/jni/SDL2-2.0.3/test/testnative.c +++ b/jni/SDL2-2.0.4/test/testnative.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testnative.h b/jni/SDL2-2.0.4/test/testnative.h similarity index 95% rename from jni/SDL2-2.0.3/test/testnative.h rename to jni/SDL2-2.0.4/test/testnative.h index a373fa98..ed2bf7e5 100644 --- a/jni/SDL2-2.0.3/test/testnative.h +++ b/jni/SDL2-2.0.4/test/testnative.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testnativecocoa.m b/jni/SDL2-2.0.4/test/testnativecocoa.m similarity index 100% rename from jni/SDL2-2.0.3/test/testnativecocoa.m rename to jni/SDL2-2.0.4/test/testnativecocoa.m diff --git a/jni/SDL2-2.0.3/test/testnativew32.c b/jni/SDL2-2.0.4/test/testnativew32.c similarity index 97% rename from jni/SDL2-2.0.3/test/testnativew32.c rename to jni/SDL2-2.0.4/test/testnativew32.c index 7ca41500..aaea267d 100644 --- a/jni/SDL2-2.0.3/test/testnativew32.c +++ b/jni/SDL2-2.0.4/test/testnativew32.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testnativex11.c b/jni/SDL2-2.0.4/test/testnativex11.c similarity index 94% rename from jni/SDL2-2.0.3/test/testnativex11.c rename to jni/SDL2-2.0.4/test/testnativex11.c index fc6fd9ab..69fa37bb 100644 --- a/jni/SDL2-2.0.3/test/testnativex11.c +++ b/jni/SDL2-2.0.4/test/testnativex11.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testoverlay2.c b/jni/SDL2-2.0.4/test/testoverlay2.c similarity index 99% rename from jni/SDL2-2.0.3/test/testoverlay2.c rename to jni/SDL2-2.0.4/test/testoverlay2.c index 47a633a2..453f0f44 100644 --- a/jni/SDL2-2.0.3/test/testoverlay2.c +++ b/jni/SDL2-2.0.4/test/testoverlay2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testplatform.c b/jni/SDL2-2.0.4/test/testplatform.c similarity index 98% rename from jni/SDL2-2.0.3/test/testplatform.c rename to jni/SDL2-2.0.4/test/testplatform.c index 51b0f178..14acac4b 100644 --- a/jni/SDL2-2.0.3/test/testplatform.c +++ b/jni/SDL2-2.0.4/test/testplatform.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testpower.c b/jni/SDL2-2.0.4/test/testpower.c similarity index 96% rename from jni/SDL2-2.0.3/test/testpower.c rename to jni/SDL2-2.0.4/test/testpower.c index b400f33b..300d21a2 100644 --- a/jni/SDL2-2.0.3/test/testpower.c +++ b/jni/SDL2-2.0.4/test/testpower.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testrelative.c b/jni/SDL2-2.0.4/test/testrelative.c similarity index 98% rename from jni/SDL2-2.0.3/test/testrelative.c rename to jni/SDL2-2.0.4/test/testrelative.c index a8c57444..59d23f63 100644 --- a/jni/SDL2-2.0.3/test/testrelative.c +++ b/jni/SDL2-2.0.4/test/testrelative.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testrendercopyex.c b/jni/SDL2-2.0.4/test/testrendercopyex.c similarity index 99% rename from jni/SDL2-2.0.3/test/testrendercopyex.c rename to jni/SDL2-2.0.4/test/testrendercopyex.c index 8c5e5192..856abf7d 100644 --- a/jni/SDL2-2.0.3/test/testrendercopyex.c +++ b/jni/SDL2-2.0.4/test/testrendercopyex.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testrendertarget.c b/jni/SDL2-2.0.4/test/testrendertarget.c similarity index 99% rename from jni/SDL2-2.0.3/test/testrendertarget.c rename to jni/SDL2-2.0.4/test/testrendertarget.c index 0ae0a824..c5e1dce0 100644 --- a/jni/SDL2-2.0.3/test/testrendertarget.c +++ b/jni/SDL2-2.0.4/test/testrendertarget.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testresample.c b/jni/SDL2-2.0.4/test/testresample.c similarity index 98% rename from jni/SDL2-2.0.3/test/testresample.c rename to jni/SDL2-2.0.4/test/testresample.c index 1c1333d0..0e92bbe1 100644 --- a/jni/SDL2-2.0.3/test/testresample.c +++ b/jni/SDL2-2.0.4/test/testresample.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testrumble.c b/jni/SDL2-2.0.4/test/testrumble.c similarity index 98% rename from jni/SDL2-2.0.3/test/testrumble.c rename to jni/SDL2-2.0.4/test/testrumble.c index 27c1937e..ea7466d2 100644 --- a/jni/SDL2-2.0.3/test/testrumble.c +++ b/jni/SDL2-2.0.4/test/testrumble.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testscale.c b/jni/SDL2-2.0.4/test/testscale.c similarity index 98% rename from jni/SDL2-2.0.3/test/testscale.c rename to jni/SDL2-2.0.4/test/testscale.c index d3edf676..9f5fdbff 100644 --- a/jni/SDL2-2.0.3/test/testscale.c +++ b/jni/SDL2-2.0.4/test/testscale.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testsem.c b/jni/SDL2-2.0.4/test/testsem.c similarity index 98% rename from jni/SDL2-2.0.3/test/testsem.c rename to jni/SDL2-2.0.4/test/testsem.c index 456c4f06..b8d3b274 100644 --- a/jni/SDL2-2.0.3/test/testsem.c +++ b/jni/SDL2-2.0.4/test/testsem.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testshader.c b/jni/SDL2-2.0.4/test/testshader.c similarity index 99% rename from jni/SDL2-2.0.3/test/testshader.c rename to jni/SDL2-2.0.4/test/testshader.c index 9a29c6cb..fc6da298 100644 --- a/jni/SDL2-2.0.3/test/testshader.c +++ b/jni/SDL2-2.0.4/test/testshader.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testshape.c b/jni/SDL2-2.0.4/test/testshape.c similarity index 99% rename from jni/SDL2-2.0.3/test/testshape.c rename to jni/SDL2-2.0.4/test/testshape.c index 845dd59e..00750a97 100644 --- a/jni/SDL2-2.0.3/test/testshape.c +++ b/jni/SDL2-2.0.4/test/testshape.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testsprite2.c b/jni/SDL2-2.0.4/test/testsprite2.c similarity index 99% rename from jni/SDL2-2.0.3/test/testsprite2.c rename to jni/SDL2-2.0.4/test/testsprite2.c index aa5c930e..7a33af30 100644 --- a/jni/SDL2-2.0.3/test/testsprite2.c +++ b/jni/SDL2-2.0.4/test/testsprite2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testspriteminimal.c b/jni/SDL2-2.0.4/test/testspriteminimal.c similarity index 98% rename from jni/SDL2-2.0.3/test/testspriteminimal.c rename to jni/SDL2-2.0.4/test/testspriteminimal.c index 0e3e9a27..05f97309 100644 --- a/jni/SDL2-2.0.3/test/testspriteminimal.c +++ b/jni/SDL2-2.0.4/test/testspriteminimal.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -184,7 +184,7 @@ main(int argc, char *argv[]) #else while (!done) { loop(); - } + } #endif quit(0); diff --git a/jni/SDL2-2.0.3/test/teststreaming.c b/jni/SDL2-2.0.4/test/teststreaming.c similarity index 99% rename from jni/SDL2-2.0.3/test/teststreaming.c rename to jni/SDL2-2.0.4/test/teststreaming.c index 623d5879..86cc1391 100644 --- a/jni/SDL2-2.0.3/test/teststreaming.c +++ b/jni/SDL2-2.0.4/test/teststreaming.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testthread.c b/jni/SDL2-2.0.4/test/testthread.c similarity index 97% rename from jni/SDL2-2.0.3/test/testthread.c rename to jni/SDL2-2.0.4/test/testthread.c index 45077d90..90e2c60c 100644 --- a/jni/SDL2-2.0.3/test/testthread.c +++ b/jni/SDL2-2.0.4/test/testthread.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testtimer.c b/jni/SDL2-2.0.4/test/testtimer.c similarity index 94% rename from jni/SDL2-2.0.3/test/testtimer.c rename to jni/SDL2-2.0.4/test/testtimer.c index 5d8d8c7f..32b74909 100644 --- a/jni/SDL2-2.0.3/test/testtimer.c +++ b/jni/SDL2-2.0.4/test/testtimer.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -107,7 +107,7 @@ main(int argc, char *argv[]) now = SDL_GetPerformanceCounter(); SDL_Log("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency()); - SDL_Log("Performance counter frequency: %"PRIu64"\n", (unsigned long long) SDL_GetPerformanceFrequency()); + SDL_Log("Performance counter frequency: %"SDL_PRIu64"\n", (unsigned long long) SDL_GetPerformanceFrequency()); start32 = SDL_GetTicks(); start = SDL_GetPerformanceCounter(); SDL_Delay(1000); diff --git a/jni/SDL2-2.0.3/test/testver.c b/jni/SDL2-2.0.4/test/testver.c similarity index 95% rename from jni/SDL2-2.0.3/test/testver.c rename to jni/SDL2-2.0.4/test/testver.c index 0f934989..f0e3bcf3 100644 --- a/jni/SDL2-2.0.3/test/testver.c +++ b/jni/SDL2-2.0.4/test/testver.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testviewport.c b/jni/SDL2-2.0.4/test/testviewport.c similarity index 99% rename from jni/SDL2-2.0.3/test/testviewport.c rename to jni/SDL2-2.0.4/test/testviewport.c index 957498a6..7ed4e6ec 100644 --- a/jni/SDL2-2.0.3/test/testviewport.c +++ b/jni/SDL2-2.0.4/test/testviewport.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/testwm2.c b/jni/SDL2-2.0.4/test/testwm2.c similarity index 98% rename from jni/SDL2-2.0.3/test/testwm2.c rename to jni/SDL2-2.0.4/test/testwm2.c index 510e29d6..94ba513b 100644 --- a/jni/SDL2-2.0.3/test/testwm2.c +++ b/jni/SDL2-2.0.4/test/testwm2.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/torturethread.c b/jni/SDL2-2.0.4/test/torturethread.c similarity index 97% rename from jni/SDL2-2.0.3/test/torturethread.c rename to jni/SDL2-2.0.4/test/torturethread.c index b774cc6f..5719a719 100644 --- a/jni/SDL2-2.0.3/test/torturethread.c +++ b/jni/SDL2-2.0.4/test/torturethread.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/jni/SDL2-2.0.3/test/utf8.txt b/jni/SDL2-2.0.4/test/utf8.txt similarity index 100% rename from jni/SDL2-2.0.3/test/utf8.txt rename to jni/SDL2-2.0.4/test/utf8.txt diff --git a/jni/SDL2-2.0.3/visualtest/COPYING.txt b/jni/SDL2-2.0.4/visualtest/COPYING.txt similarity index 100% rename from jni/SDL2-2.0.3/visualtest/COPYING.txt rename to jni/SDL2-2.0.4/visualtest/COPYING.txt diff --git a/jni/SDL2-2.0.3/visualtest/Makefile.in b/jni/SDL2-2.0.4/visualtest/Makefile.in similarity index 100% rename from jni/SDL2-2.0.3/visualtest/Makefile.in rename to jni/SDL2-2.0.4/visualtest/Makefile.in diff --git a/jni/SDL2-2.0.3/visualtest/README.txt b/jni/SDL2-2.0.4/visualtest/README.txt similarity index 100% rename from jni/SDL2-2.0.3/visualtest/README.txt rename to jni/SDL2-2.0.4/visualtest/README.txt diff --git a/jni/SDL2-2.0.3/visualtest/acinclude.m4 b/jni/SDL2-2.0.4/visualtest/acinclude.m4 similarity index 100% rename from jni/SDL2-2.0.3/visualtest/acinclude.m4 rename to jni/SDL2-2.0.4/visualtest/acinclude.m4 diff --git a/jni/SDL2-2.0.3/visualtest/autogen.sh b/jni/SDL2-2.0.4/visualtest/autogen.sh similarity index 100% rename from jni/SDL2-2.0.3/visualtest/autogen.sh rename to jni/SDL2-2.0.4/visualtest/autogen.sh diff --git a/jni/SDL2-2.0.3/visualtest/compile b/jni/SDL2-2.0.4/visualtest/compile similarity index 100% rename from jni/SDL2-2.0.3/visualtest/compile rename to jni/SDL2-2.0.4/visualtest/compile diff --git a/jni/SDL2-2.0.3/visualtest/config.h b/jni/SDL2-2.0.4/visualtest/config.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/config.h rename to jni/SDL2-2.0.4/visualtest/config.h diff --git a/jni/SDL2-2.0.3/visualtest/config.h.in b/jni/SDL2-2.0.4/visualtest/config.h.in similarity index 100% rename from jni/SDL2-2.0.3/visualtest/config.h.in rename to jni/SDL2-2.0.4/visualtest/config.h.in diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.actions b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.actions rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.actions diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.config b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.config rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.config diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.parameters b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.parameters rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_blendmodes/testsprite2_blendmodes.parameters diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.actions b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.actions rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.actions diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.config b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.config rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.config diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.parameters b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.parameters rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_crashtest/testsprite2_crashtest.parameters diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.actions b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.actions rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.actions diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.config b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.config rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.config diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.parameters b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.parameters rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_fullscreen/testsprite2_fullscreen.parameters diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.actions b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.actions rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.actions diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.config b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.config rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.config diff --git a/jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.parameters b/jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configs/testsprite2_geometry/testsprite2_geometry.parameters rename to jni/SDL2-2.0.4/visualtest/configs/testsprite2_geometry/testsprite2_geometry.parameters diff --git a/jni/SDL2-2.0.3/visualtest/configure b/jni/SDL2-2.0.4/visualtest/configure similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configure rename to jni/SDL2-2.0.4/visualtest/configure diff --git a/jni/SDL2-2.0.3/visualtest/configure.in b/jni/SDL2-2.0.4/visualtest/configure.in similarity index 100% rename from jni/SDL2-2.0.3/visualtest/configure.in rename to jni/SDL2-2.0.4/visualtest/configure.in diff --git a/jni/SDL2-2.0.3/visualtest/depcomp b/jni/SDL2-2.0.4/visualtest/depcomp similarity index 100% rename from jni/SDL2-2.0.3/visualtest/depcomp rename to jni/SDL2-2.0.4/visualtest/depcomp diff --git a/jni/SDL2-2.0.3/visualtest/docs/Doxyfile b/jni/SDL2-2.0.4/visualtest/docs/Doxyfile similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/Doxyfile rename to jni/SDL2-2.0.4/visualtest/docs/Doxyfile diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__action__configparser_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__exhaustive__variator_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__harness__argparser_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__mischelper_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__mischelper_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__mischelper_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__mischelper_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__parsehelper_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__process_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__process_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__process_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__process_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__process_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__process_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__process_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__process_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__random__variator_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__rwhelper_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__rwhelper_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__rwhelper_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__rwhelper_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__screenshot_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__sut__configparser_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variator__common_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variators_8h.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variators_8h.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variators_8h.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variators_8h.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variators_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variators_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/_s_d_l__visualtest__variators_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/_s_d_l__visualtest__variators_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/action__configparser_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/action__configparser_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/action__configparser_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/action__configparser_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/annotated.html b/jni/SDL2-2.0.4/visualtest/docs/html/annotated.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/annotated.html rename to jni/SDL2-2.0.4/visualtest/docs/html/annotated.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/bc_s.png b/jni/SDL2-2.0.4/visualtest/docs/html/bc_s.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/bc_s.png rename to jni/SDL2-2.0.4/visualtest/docs/html/bc_s.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/bdwn.png b/jni/SDL2-2.0.4/visualtest/docs/html/bdwn.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/bdwn.png rename to jni/SDL2-2.0.4/visualtest/docs/html/bdwn.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/classes.html b/jni/SDL2-2.0.4/visualtest/docs/html/classes.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/classes.html rename to jni/SDL2-2.0.4/visualtest/docs/html/classes.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/closed.png b/jni/SDL2-2.0.4/visualtest/docs/html/closed.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/closed.png rename to jni/SDL2-2.0.4/visualtest/docs/html/closed.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/config_8h_source.html b/jni/SDL2-2.0.4/visualtest/docs/html/config_8h_source.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/config_8h_source.html rename to jni/SDL2-2.0.4/visualtest/docs/html/config_8h_source.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_244674c763b96fdad0a6ffe8d0250e08.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_244674c763b96fdad0a6ffe8d0250e08.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_244674c763b96fdad0a6ffe8d0250e08.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_244674c763b96fdad0a6ffe8d0250e08.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_88e6415a3128b404f1102a130772bdb6.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_88e6415a3128b404f1102a130772bdb6.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_88e6415a3128b404f1102a130772bdb6.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_88e6415a3128b404f1102a130772bdb6.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_a18918b93668b435612395bbc2e8b82b.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_a18918b93668b435612395bbc2e8b82b.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_a18918b93668b435612395bbc2e8b82b.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_a18918b93668b435612395bbc2e8b82b.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_f584182df4c69fab0b14563b4d535158.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_f584182df4c69fab0b14563b4d535158.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_f584182df4c69fab0b14563b4d535158.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_f584182df4c69fab0b14563b4d535158.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dir_fe549de2418b81853b5f194edb4a7f34.html b/jni/SDL2-2.0.4/visualtest/docs/html/dir_fe549de2418b81853b5f194edb4a7f34.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dir_fe549de2418b81853b5f194edb4a7f34.html rename to jni/SDL2-2.0.4/visualtest/docs/html/dir_fe549de2418b81853b5f194edb4a7f34.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/doxygen.css b/jni/SDL2-2.0.4/visualtest/docs/html/doxygen.css similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/doxygen.css rename to jni/SDL2-2.0.4/visualtest/docs/html/doxygen.css diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/doxygen.png b/jni/SDL2-2.0.4/visualtest/docs/html/doxygen.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/doxygen.png rename to jni/SDL2-2.0.4/visualtest/docs/html/doxygen.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/dynsections.js b/jni/SDL2-2.0.4/visualtest/docs/html/dynsections.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/dynsections.js rename to jni/SDL2-2.0.4/visualtest/docs/html/dynsections.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/files.html b/jni/SDL2-2.0.4/visualtest/docs/html/files.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/files.html rename to jni/SDL2-2.0.4/visualtest/docs/html/files.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2blank.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2blank.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2blank.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2blank.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2cl.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2cl.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2cl.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2cl.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2doc.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2doc.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2doc.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2doc.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2folderclosed.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2folderclosed.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2folderclosed.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2folderclosed.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2folderopen.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2folderopen.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2folderopen.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2folderopen.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2lastnode.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2lastnode.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2lastnode.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2lastnode.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2link.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2link.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2link.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2link.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2mlastnode.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2mlastnode.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2mlastnode.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2mlastnode.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2mnode.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2mnode.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2mnode.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2mnode.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2mo.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2mo.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2mo.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2mo.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2node.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2node.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2node.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2node.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2ns.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2ns.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2ns.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2ns.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2plastnode.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2plastnode.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2plastnode.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2plastnode.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2pnode.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2pnode.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2pnode.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2pnode.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2splitbar.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2splitbar.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2splitbar.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2splitbar.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/ftv2vertline.png b/jni/SDL2-2.0.4/visualtest/docs/html/ftv2vertline.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/ftv2vertline.png rename to jni/SDL2-2.0.4/visualtest/docs/html/ftv2vertline.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/functions.html b/jni/SDL2-2.0.4/visualtest/docs/html/functions.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/functions.html rename to jni/SDL2-2.0.4/visualtest/docs/html/functions.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/functions_vars.html b/jni/SDL2-2.0.4/visualtest/docs/html/functions_vars.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/functions_vars.html rename to jni/SDL2-2.0.4/visualtest/docs/html/functions_vars.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals_defs.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals_defs.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals_defs.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals_defs.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals_enum.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals_enum.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals_enum.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals_enum.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals_eval.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals_eval.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals_eval.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals_eval.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals_func.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals_func.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals_func.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals_func.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/globals_type.html b/jni/SDL2-2.0.4/visualtest/docs/html/globals_type.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/globals_type.html rename to jni/SDL2-2.0.4/visualtest/docs/html/globals_type.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/harness__argparser_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/harness__argparser_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/harness__argparser_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/harness__argparser_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/index.html b/jni/SDL2-2.0.4/visualtest/docs/html/index.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/index.html rename to jni/SDL2-2.0.4/visualtest/docs/html/index.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/jquery.js b/jni/SDL2-2.0.4/visualtest/docs/html/jquery.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/jquery.js rename to jni/SDL2-2.0.4/visualtest/docs/html/jquery.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/linux__process_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/linux__process_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/linux__process_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/linux__process_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/mischelper_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/mischelper_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/mischelper_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/mischelper_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/nav_f.png b/jni/SDL2-2.0.4/visualtest/docs/html/nav_f.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/nav_f.png rename to jni/SDL2-2.0.4/visualtest/docs/html/nav_f.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/nav_g.png b/jni/SDL2-2.0.4/visualtest/docs/html/nav_g.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/nav_g.png rename to jni/SDL2-2.0.4/visualtest/docs/html/nav_g.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/nav_h.png b/jni/SDL2-2.0.4/visualtest/docs/html/nav_h.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/nav_h.png rename to jni/SDL2-2.0.4/visualtest/docs/html/nav_h.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/open.png b/jni/SDL2-2.0.4/visualtest/docs/html/open.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/open.png rename to jni/SDL2-2.0.4/visualtest/docs/html/open.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/parsehelper_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/parsehelper_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/parsehelper_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/parsehelper_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/rwhelper_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/rwhelper_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/rwhelper_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/rwhelper_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/screenshot_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/screenshot_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/screenshot_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/screenshot_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_61.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_61.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_61.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_61.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_61.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_61.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_61.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_61.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_62.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_62.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_62.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_62.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_62.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_62.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_62.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_62.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_63.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_63.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_63.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_63.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_63.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_63.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_63.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_63.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_64.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_64.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_64.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_64.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_64.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_64.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_64.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_64.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_65.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_65.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_65.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_65.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_65.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_65.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_65.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_65.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_66.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_66.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_66.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_66.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_66.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_66.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_66.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_66.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_68.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_68.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_68.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_68.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_68.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_68.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_68.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_68.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_69.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_69.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_69.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_69.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_69.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_69.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_69.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_69.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6b.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6b.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6b.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6b.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6b.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6b.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6b.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6b.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6c.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6c.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6c.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6c.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6c.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6d.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6d.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6d.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6d.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6d.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6d.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6d.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6d.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6e.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6e.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6e.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6e.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6e.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6e.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6e.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6e.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6f.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6f.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6f.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6f.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_6f.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_6f.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_6f.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_6f.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_70.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_70.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_70.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_70.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_70.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_70.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_70.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_70.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_72.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_72.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_72.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_72.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_72.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_72.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_72.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_72.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_74.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_74.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_74.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_74.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_74.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_74.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_74.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_74.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_76.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_76.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_76.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_76.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_76.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_76.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_76.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_76.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_77.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_77.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_77.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_77.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/all_77.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/all_77.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/all_77.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/all_77.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/classes_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/classes_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/classes_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/classes_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/classes_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/classes_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/classes_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/classes_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/close.png b/jni/SDL2-2.0.4/visualtest/docs/html/search/close.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/close.png rename to jni/SDL2-2.0.4/visualtest/docs/html/search/close.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_61.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_61.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_61.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_61.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_61.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_61.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_61.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_61.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_64.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_64.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_64.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_64.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_64.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_64.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_64.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_64.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6b.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6b.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6b.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6b.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6b.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6b.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6b.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6b.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6d.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6d.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6d.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6d.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6d.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6d.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_6d.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_6d.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_74.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_74.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_74.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_74.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/defines_74.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/defines_74.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/defines_74.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/defines_74.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/enums_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/enums_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/enums_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/enums_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/enums_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/enums_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/enums_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/enums_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/enumvalues_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/enumvalues_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/enumvalues_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/enumvalues_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/enumvalues_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/enumvalues_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/enumvalues_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/enumvalues_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_61.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_61.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_61.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_61.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_61.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_61.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_61.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_61.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_68.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_68.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_68.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_68.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_68.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_68.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_68.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_68.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_6c.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_6c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_6c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_6c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_6c.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_6c.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_6c.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_6c.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_6d.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_6d.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_6d.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_6d.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_6d.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_6d.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_6d.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_6d.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_70.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_70.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_70.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_70.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_70.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_70.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_70.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_70.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_72.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_72.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_72.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_72.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_72.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_72.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_72.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_72.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_74.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_74.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_74.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_74.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_74.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_74.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_74.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_74.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_76.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_76.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_76.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_76.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_76.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_76.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_76.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_76.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_77.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_77.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_77.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_77.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/files_77.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/files_77.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/files_77.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/files_77.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/functions_6d.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/functions_6d.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/functions_6d.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/functions_6d.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/functions_6d.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/functions_6d.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/functions_6d.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/functions_6d.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/functions_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/functions_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/functions_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/functions_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/functions_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/functions_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/functions_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/functions_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/mag_sel.png b/jni/SDL2-2.0.4/visualtest/docs/html/search/mag_sel.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/mag_sel.png rename to jni/SDL2-2.0.4/visualtest/docs/html/search/mag_sel.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/nomatches.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/nomatches.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/nomatches.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/nomatches.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/pages_76.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/pages_76.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/pages_76.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/pages_76.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/pages_76.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/pages_76.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/pages_76.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/pages_76.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/search.css b/jni/SDL2-2.0.4/visualtest/docs/html/search/search.css similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/search.css rename to jni/SDL2-2.0.4/visualtest/docs/html/search/search.css diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/search.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/search.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/search.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/search.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/search_l.png b/jni/SDL2-2.0.4/visualtest/docs/html/search/search_l.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/search_l.png rename to jni/SDL2-2.0.4/visualtest/docs/html/search/search_l.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/search_m.png b/jni/SDL2-2.0.4/visualtest/docs/html/search/search_m.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/search_m.png rename to jni/SDL2-2.0.4/visualtest/docs/html/search/search_m.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/search_r.png b/jni/SDL2-2.0.4/visualtest/docs/html/search/search_r.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/search_r.png rename to jni/SDL2-2.0.4/visualtest/docs/html/search/search_r.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/typedefs_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/typedefs_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/typedefs_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/typedefs_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/typedefs_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/typedefs_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/typedefs_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/typedefs_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_61.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_61.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_61.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_61.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_61.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_61.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_61.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_61.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_62.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_62.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_62.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_62.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_62.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_62.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_62.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_62.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_63.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_63.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_63.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_63.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_63.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_63.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_63.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_63.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_64.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_64.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_64.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_64.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_64.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_64.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_64.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_64.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_65.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_65.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_65.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_65.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_65.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_65.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_65.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_65.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_66.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_66.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_66.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_66.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_66.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_66.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_66.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_66.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_69.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_69.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_69.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_69.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_69.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_69.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_69.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_69.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6d.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6d.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6d.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6d.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6d.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6d.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6d.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6d.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6e.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6e.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6e.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6e.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6e.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6e.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6e.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6e.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6f.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6f.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6f.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6f.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6f.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6f.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_6f.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_6f.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_70.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_70.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_70.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_70.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_70.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_70.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_70.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_70.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_72.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_72.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_72.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_72.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_72.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_72.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_72.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_72.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_73.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_73.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_73.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_73.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_73.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_73.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_73.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_73.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_74.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_74.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_74.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_74.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_74.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_74.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_74.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_74.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_76.html b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_76.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_76.html rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_76.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/search/variables_76.js b/jni/SDL2-2.0.4/visualtest/docs/html/search/variables_76.js similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/search/variables_76.js rename to jni/SDL2-2.0.4/visualtest/docs/html/search/variables_76.js diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l___process_exit_status.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l___process_exit_status.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l___process_exit_status.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l___process_exit_status.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l___process_info.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l___process_info.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l___process_info.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l___process_info.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action_node.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action_node.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action_node.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action_node.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action_queue.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action_queue.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___action_queue.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___action_queue.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___exhaustive_variator.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___exhaustive_variator.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___exhaustive_variator.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___exhaustive_variator.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___harness_state.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___harness_state.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___harness_state.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___harness_state.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___r_w_helper_buffer.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___r_w_helper_buffer.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___r_w_helper_buffer.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___r_w_helper_buffer.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___random_variator.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___random_variator.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___random_variator.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___random_variator.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_config.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_config.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_config.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_config.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_int_range.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_int_range.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_int_range.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_int_range.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_option.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_option.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_option.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___s_u_t_option.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___variation.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___variation.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___variation.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___variation.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___variator.html b/jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___variator.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/struct_s_d_l_visual_test___variator.html rename to jni/SDL2-2.0.4/visualtest/docs/html/struct_s_d_l_visual_test___variator.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/sut__configparser_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/sut__configparser_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/sut__configparser_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/sut__configparser_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/sync_off.png b/jni/SDL2-2.0.4/visualtest/docs/html/sync_off.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/sync_off.png rename to jni/SDL2-2.0.4/visualtest/docs/html/sync_off.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/sync_on.png b/jni/SDL2-2.0.4/visualtest/docs/html/sync_on.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/sync_on.png rename to jni/SDL2-2.0.4/visualtest/docs/html/sync_on.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/tab_a.png b/jni/SDL2-2.0.4/visualtest/docs/html/tab_a.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/tab_a.png rename to jni/SDL2-2.0.4/visualtest/docs/html/tab_a.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/tab_b.png b/jni/SDL2-2.0.4/visualtest/docs/html/tab_b.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/tab_b.png rename to jni/SDL2-2.0.4/visualtest/docs/html/tab_b.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/tab_h.png b/jni/SDL2-2.0.4/visualtest/docs/html/tab_h.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/tab_h.png rename to jni/SDL2-2.0.4/visualtest/docs/html/tab_h.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/tab_s.png b/jni/SDL2-2.0.4/visualtest/docs/html/tab_s.png similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/tab_s.png rename to jni/SDL2-2.0.4/visualtest/docs/html/tab_s.png diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/tabs.css b/jni/SDL2-2.0.4/visualtest/docs/html/tabs.css similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/tabs.css rename to jni/SDL2-2.0.4/visualtest/docs/html/tabs.css diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/testharness_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/testharness_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/testharness_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/testharness_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/union_s_d_l_visual_test___s_u_t_option_value.html b/jni/SDL2-2.0.4/visualtest/docs/html/union_s_d_l_visual_test___s_u_t_option_value.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/union_s_d_l_visual_test___s_u_t_option_value.html rename to jni/SDL2-2.0.4/visualtest/docs/html/union_s_d_l_visual_test___s_u_t_option_value.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/variator__common_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/variator__common_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/variator__common_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/variator__common_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/variator__exhaustive_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/variator__exhaustive_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/variator__exhaustive_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/variator__exhaustive_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/variator__random_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/variator__random_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/variator__random_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/variator__random_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/variators_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/variators_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/variators_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/variators_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/windows__process_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/windows__process_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/windows__process_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/windows__process_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/html/windows__screenshot_8c.html b/jni/SDL2-2.0.4/visualtest/docs/html/windows__screenshot_8c.html similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/html/windows__screenshot_8c.html rename to jni/SDL2-2.0.4/visualtest/docs/html/windows__screenshot_8c.html diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__action__configparser_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__action__configparser_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__action__configparser_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__action__configparser_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__exhaustive__variator_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__exhaustive__variator_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__exhaustive__variator_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__exhaustive__variator_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__harness__argparser_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__harness__argparser_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__harness__argparser_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__harness__argparser_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__parsehelper_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__parsehelper_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__parsehelper_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__parsehelper_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__process_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__process_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__process_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__process_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__random__variator_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__random__variator_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__random__variator_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__random__variator_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__screenshot_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__screenshot_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__screenshot_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__screenshot_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__sut__configparser_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__sut__configparser_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__sut__configparser_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__sut__configparser_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__variator__common_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__variator__common_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__variator__common_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__variator__common_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__variators_8h.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__variators_8h.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/_s_d_l__visualtest__variators_8h.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/_s_d_l__visualtest__variators_8h.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/action__configparser_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/action__configparser_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/action__configparser_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/action__configparser_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/annotated.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/annotated.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/annotated.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/annotated.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_244674c763b96fdad0a6ffe8d0250e08.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_244674c763b96fdad0a6ffe8d0250e08.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_244674c763b96fdad0a6ffe8d0250e08.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_244674c763b96fdad0a6ffe8d0250e08.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_68267d1309a1af8e8297ef4c3efbcdba.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_68267d1309a1af8e8297ef4c3efbcdba.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_68267d1309a1af8e8297ef4c3efbcdba.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_68267d1309a1af8e8297ef4c3efbcdba.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_88e6415a3128b404f1102a130772bdb6.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_88e6415a3128b404f1102a130772bdb6.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_88e6415a3128b404f1102a130772bdb6.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_88e6415a3128b404f1102a130772bdb6.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_a18918b93668b435612395bbc2e8b82b.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_a18918b93668b435612395bbc2e8b82b.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_a18918b93668b435612395bbc2e8b82b.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_a18918b93668b435612395bbc2e8b82b.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_d44c64559bbebec7f509842c48db8b23.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_d44c64559bbebec7f509842c48db8b23.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_d44c64559bbebec7f509842c48db8b23.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_d44c64559bbebec7f509842c48db8b23.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_f584182df4c69fab0b14563b4d535158.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_f584182df4c69fab0b14563b4d535158.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_f584182df4c69fab0b14563b4d535158.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_f584182df4c69fab0b14563b4d535158.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/dir_fe549de2418b81853b5f194edb4a7f34.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/dir_fe549de2418b81853b5f194edb4a7f34.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/dir_fe549de2418b81853b5f194edb4a7f34.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/dir_fe549de2418b81853b5f194edb4a7f34.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/doxygen.sty b/jni/SDL2-2.0.4/visualtest/docs/latex/doxygen.sty similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/doxygen.sty rename to jni/SDL2-2.0.4/visualtest/docs/latex/doxygen.sty diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/files.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/files.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/files.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/files.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/harness__argparser_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/harness__argparser_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/harness__argparser_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/harness__argparser_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/index.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/index.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/index.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/index.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/linux__process_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/linux__process_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/linux__process_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/linux__process_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/make.bat b/jni/SDL2-2.0.4/visualtest/docs/latex/make.bat similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/make.bat rename to jni/SDL2-2.0.4/visualtest/docs/latex/make.bat diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/mischelper_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/mischelper_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/mischelper_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/mischelper_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/parsehelper_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/parsehelper_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/parsehelper_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/parsehelper_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/refman.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/refman.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/refman.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/refman.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/rwhelper_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/rwhelper_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/rwhelper_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/rwhelper_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/screenshot_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/screenshot_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/screenshot_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/screenshot_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l___process_exit_status.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l___process_exit_status.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l___process_exit_status.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l___process_exit_status.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l___process_info.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l___process_info.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l___process_info.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l___process_info.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action_node.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action_node.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action_node.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action_node.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action_queue.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action_queue.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___action_queue.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___action_queue.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___exhaustive_variator.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___exhaustive_variator.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___exhaustive_variator.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___exhaustive_variator.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___harness_state.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___harness_state.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___harness_state.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___harness_state.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___r_w_helper_buffer.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___r_w_helper_buffer.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___r_w_helper_buffer.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___r_w_helper_buffer.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___random_variator.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___random_variator.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___random_variator.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___random_variator.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_config.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_config.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_config.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_config.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_int_range.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_int_range.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_int_range.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_int_range.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_option.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_option.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_option.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___s_u_t_option.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___variation.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___variation.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___variation.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___variation.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___variator.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___variator.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/struct_s_d_l_visual_test___variator.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/struct_s_d_l_visual_test___variator.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/sut__configparser_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/sut__configparser_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/sut__configparser_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/sut__configparser_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/testharness_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/testharness_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/testharness_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/testharness_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/union_s_d_l_visual_test___s_u_t_option_value.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/union_s_d_l_visual_test___s_u_t_option_value.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/union_s_d_l_visual_test___s_u_t_option_value.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/union_s_d_l_visual_test___s_u_t_option_value.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/variator__common_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/variator__common_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/variator__common_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/variator__common_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/variator__exhaustive_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/variator__exhaustive_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/variator__exhaustive_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/variator__exhaustive_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/variator__random_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/variator__random_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/variator__random_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/variator__random_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/variators_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/variators_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/variators_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/variators_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/windows__process_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/windows__process_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/windows__process_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/windows__process_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/docs/latex/windows__screenshot_8c.tex b/jni/SDL2-2.0.4/visualtest/docs/latex/windows__screenshot_8c.tex similarity index 100% rename from jni/SDL2-2.0.3/visualtest/docs/latex/windows__screenshot_8c.tex rename to jni/SDL2-2.0.4/visualtest/docs/latex/windows__screenshot_8c.tex diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_action_configparser.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_action_configparser.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_action_configparser.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_action_configparser.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_exhaustive_variator.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_exhaustive_variator.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_exhaustive_variator.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_exhaustive_variator.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_harness_argparser.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_harness_argparser.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_harness_argparser.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_harness_argparser.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_mischelper.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_mischelper.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_mischelper.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_mischelper.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_parsehelper.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_parsehelper.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_parsehelper.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_parsehelper.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_process.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_process.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_process.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_process.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_random_variator.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_random_variator.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_random_variator.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_random_variator.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_rwhelper.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_rwhelper.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_rwhelper.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_rwhelper.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_screenshot.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_screenshot.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_screenshot.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_screenshot.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_sut_configparser.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_sut_configparser.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_sut_configparser.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_sut_configparser.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_variator_common.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_variator_common.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_variator_common.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_variator_common.h diff --git a/jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_variators.h b/jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_variators.h similarity index 100% rename from jni/SDL2-2.0.3/visualtest/include/SDL_visualtest_variators.h rename to jni/SDL2-2.0.4/visualtest/include/SDL_visualtest_variators.h diff --git a/jni/SDL2-2.0.3/visualtest/install-sh b/jni/SDL2-2.0.4/visualtest/install-sh similarity index 100% rename from jni/SDL2-2.0.3/visualtest/install-sh rename to jni/SDL2-2.0.4/visualtest/install-sh diff --git a/jni/SDL2-2.0.3/visualtest/launch_harness.cmd b/jni/SDL2-2.0.4/visualtest/launch_harness.cmd similarity index 100% rename from jni/SDL2-2.0.3/visualtest/launch_harness.cmd rename to jni/SDL2-2.0.4/visualtest/launch_harness.cmd diff --git a/jni/SDL2-2.0.3/visualtest/launch_harness.sh b/jni/SDL2-2.0.4/visualtest/launch_harness.sh similarity index 100% rename from jni/SDL2-2.0.3/visualtest/launch_harness.sh rename to jni/SDL2-2.0.4/visualtest/launch_harness.sh diff --git a/jni/SDL2-2.0.3/visualtest/missing b/jni/SDL2-2.0.4/visualtest/missing similarity index 100% rename from jni/SDL2-2.0.3/visualtest/missing rename to jni/SDL2-2.0.4/visualtest/missing diff --git a/jni/SDL2-2.0.3/visualtest/src/action_configparser.c b/jni/SDL2-2.0.4/visualtest/src/action_configparser.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/action_configparser.c rename to jni/SDL2-2.0.4/visualtest/src/action_configparser.c diff --git a/jni/SDL2-2.0.3/visualtest/src/harness_argparser.c b/jni/SDL2-2.0.4/visualtest/src/harness_argparser.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/harness_argparser.c rename to jni/SDL2-2.0.4/visualtest/src/harness_argparser.c diff --git a/jni/SDL2-2.0.3/visualtest/src/linux/linux_process.c b/jni/SDL2-2.0.4/visualtest/src/linux/linux_process.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/linux/linux_process.c rename to jni/SDL2-2.0.4/visualtest/src/linux/linux_process.c diff --git a/jni/SDL2-2.0.3/visualtest/src/mischelper.c b/jni/SDL2-2.0.4/visualtest/src/mischelper.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/mischelper.c rename to jni/SDL2-2.0.4/visualtest/src/mischelper.c diff --git a/jni/SDL2-2.0.3/visualtest/src/parsehelper.c b/jni/SDL2-2.0.4/visualtest/src/parsehelper.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/parsehelper.c rename to jni/SDL2-2.0.4/visualtest/src/parsehelper.c diff --git a/jni/SDL2-2.0.3/visualtest/src/rwhelper.c b/jni/SDL2-2.0.4/visualtest/src/rwhelper.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/rwhelper.c rename to jni/SDL2-2.0.4/visualtest/src/rwhelper.c diff --git a/jni/SDL2-2.0.3/visualtest/src/screenshot.c b/jni/SDL2-2.0.4/visualtest/src/screenshot.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/screenshot.c rename to jni/SDL2-2.0.4/visualtest/src/screenshot.c diff --git a/jni/SDL2-2.0.3/visualtest/src/sut_configparser.c b/jni/SDL2-2.0.4/visualtest/src/sut_configparser.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/sut_configparser.c rename to jni/SDL2-2.0.4/visualtest/src/sut_configparser.c diff --git a/jni/SDL2-2.0.3/visualtest/src/testharness.c b/jni/SDL2-2.0.4/visualtest/src/testharness.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/testharness.c rename to jni/SDL2-2.0.4/visualtest/src/testharness.c diff --git a/jni/SDL2-2.0.3/visualtest/src/variator_common.c b/jni/SDL2-2.0.4/visualtest/src/variator_common.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/variator_common.c rename to jni/SDL2-2.0.4/visualtest/src/variator_common.c diff --git a/jni/SDL2-2.0.3/visualtest/src/variator_exhaustive.c b/jni/SDL2-2.0.4/visualtest/src/variator_exhaustive.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/variator_exhaustive.c rename to jni/SDL2-2.0.4/visualtest/src/variator_exhaustive.c diff --git a/jni/SDL2-2.0.3/visualtest/src/variator_random.c b/jni/SDL2-2.0.4/visualtest/src/variator_random.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/variator_random.c rename to jni/SDL2-2.0.4/visualtest/src/variator_random.c diff --git a/jni/SDL2-2.0.3/visualtest/src/variators.c b/jni/SDL2-2.0.4/visualtest/src/variators.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/variators.c rename to jni/SDL2-2.0.4/visualtest/src/variators.c diff --git a/jni/SDL2-2.0.3/visualtest/src/windows/windows_process.c b/jni/SDL2-2.0.4/visualtest/src/windows/windows_process.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/windows/windows_process.c rename to jni/SDL2-2.0.4/visualtest/src/windows/windows_process.c diff --git a/jni/SDL2-2.0.3/visualtest/src/windows/windows_screenshot.c b/jni/SDL2-2.0.4/visualtest/src/windows/windows_screenshot.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/src/windows/windows_screenshot.c rename to jni/SDL2-2.0.4/visualtest/src/windows/windows_screenshot.c diff --git a/jni/SDL2-2.0.3/visualtest/stamp-h1 b/jni/SDL2-2.0.4/visualtest/stamp-h1 similarity index 100% rename from jni/SDL2-2.0.3/visualtest/stamp-h1 rename to jni/SDL2-2.0.4/visualtest/stamp-h1 diff --git a/jni/SDL2-2.0.3/visualtest/testsprite2_sample.actions b/jni/SDL2-2.0.4/visualtest/testsprite2_sample.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/testsprite2_sample.actions rename to jni/SDL2-2.0.4/visualtest/testsprite2_sample.actions diff --git a/jni/SDL2-2.0.3/visualtest/testsprite2_sample.config b/jni/SDL2-2.0.4/visualtest/testsprite2_sample.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/testsprite2_sample.config rename to jni/SDL2-2.0.4/visualtest/testsprite2_sample.config diff --git a/jni/SDL2-2.0.3/visualtest/testsprite2_sample.parameters b/jni/SDL2-2.0.4/visualtest/testsprite2_sample.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/testsprite2_sample.parameters rename to jni/SDL2-2.0.4/visualtest/testsprite2_sample.parameters diff --git a/jni/SDL2-2.0.3/visualtest/unittest/testquit.actions b/jni/SDL2-2.0.4/visualtest/unittest/testquit.actions similarity index 100% rename from jni/SDL2-2.0.3/visualtest/unittest/testquit.actions rename to jni/SDL2-2.0.4/visualtest/unittest/testquit.actions diff --git a/jni/SDL2-2.0.3/visualtest/unittest/testquit.c b/jni/SDL2-2.0.4/visualtest/unittest/testquit.c similarity index 100% rename from jni/SDL2-2.0.3/visualtest/unittest/testquit.c rename to jni/SDL2-2.0.4/visualtest/unittest/testquit.c diff --git a/jni/SDL2-2.0.3/visualtest/unittest/testquit.config b/jni/SDL2-2.0.4/visualtest/unittest/testquit.config similarity index 100% rename from jni/SDL2-2.0.3/visualtest/unittest/testquit.config rename to jni/SDL2-2.0.4/visualtest/unittest/testquit.config diff --git a/jni/SDL2-2.0.3/visualtest/unittest/testquit.parameters b/jni/SDL2-2.0.4/visualtest/unittest/testquit.parameters similarity index 100% rename from jni/SDL2-2.0.3/visualtest/unittest/testquit.parameters rename to jni/SDL2-2.0.4/visualtest/unittest/testquit.parameters diff --git a/jni/love/Android.mk b/jni/love/Android.mk index 650416d0..ff2d17ed 100644 --- a/jni/love/Android.mk +++ b/jni/love/Android.mk @@ -16,7 +16,7 @@ LOCAL_C_INCLUDES := \ ${LOCAL_PATH}/src/modules \ ${LOCAL_PATH}/src/libraries/ \ ${LOCAL_PATH}/src/libraries/enet/libenet/include \ - ${LOCAL_PATH}/../SDL2-2.0.3/include \ + ${LOCAL_PATH}/../SDL2-2.0.4/include \ ${LOCAL_PATH}/../jasper-1.900.1/src/libjasper/include \ ${LOCAL_PATH}/../libmng-1.0.10/ \ ${LOCAL_PATH}/../lcms2-2.5/include \ @@ -107,7 +107,7 @@ LOCAL_STATIC_LIBRARIES := libphysfs libvorbis libogg libtheora libmodplug libfre # $(info liblove: include dirs $(LOCAL_C_INCLUDES)) # $(info liblove: src files $(LOCAL_SRC_FILES)) -SDL_PATH := ../SDL2-2.0.3 +SDL_PATH := ../SDL2-2.0.4 LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c LOCAL_LDLIBS := -lz -lGLESv1_CM -lGLESv2 -ldl -landroid