Display and control your Android device
Upgrade SDL (2.0.18) for Windows
Romain Vimont720c3064dfd5
diff --git a/cross_win32.txt b/cross_win32.txtindex 41ec3078..b0e43622 100644--- a/cross_win32.txt+++ b/cross_win32.txt@@ -18,4 +18,4 @@ endian = 'little'[properties]prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win32-shared'prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win32-dev'-prebuilt_sdl2 = 'SDL2-2.0.16/i686-w64-mingw32'+prebuilt_sdl2 = 'SDL2-2.0.18/i686-w64-mingw32'diff --git a/cross_win64.txt b/cross_win64.txtindex 2565330b..6625c0cf 100644--- a/cross_win64.txt+++ b/cross_win64.txt@@ -18,4 +18,4 @@ endian = 'little'[properties]prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win64-shared'prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win64-dev'-prebuilt_sdl2 = 'SDL2-2.0.16/x86_64-w64-mingw32'+prebuilt_sdl2 = 'SDL2-2.0.18/x86_64-w64-mingw32'diff --git a/prebuilt-deps/Makefile b/prebuilt-deps/Makefileindex dced047c..fa986978 100644--- a/prebuilt-deps/Makefile+++ b/prebuilt-deps/Makefile@@ -30,9 +30,9 @@ prepare-ffmpeg-dev-win64:ffmpeg-4.3.1-win64-devprepare-sdl2:- @./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.16-mingw.tar.gz \- 2bfe48628aa9635c12eac7d421907e291525de1d0b04b3bca4a5bd6e6c881a6f \- SDL2-2.0.16+ @./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.18-mingw.tar.gz \+ bbad7c6947f6ca3e05292f065852ed8b62f319fc5533047e7708769c4dbae394 \+ SDL2-2.0.18prepare-adb:@./prepare-dep https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip \diff --git a/release.mk b/release.mkindex cb6c9b2e..6414f079 100644--- a/release.mk+++ b/release.mk@@ -101,7 +101,7 @@ dist-win32: build-server build-win32cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp prebuilt-deps/SDL2-2.0.16/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/SDL2-2.0.18/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"dist-win64: build-server build-win64mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"@@ -118,7 +118,7 @@ dist-win64: build-server build-win64cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp prebuilt-deps/SDL2-2.0.16/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/SDL2-2.0.18/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"zip-win32: dist-win32cd "$(DIST)/$(WIN32_TARGET_DIR)"; \