From 34e19dcc57f35d8f152b1f5b0988800581af15df Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Thu, 27 Jan 2022 19:00:03 +0100 Subject: [PATCH] Upgrade SDL (2.0.20) for Windows Include the latest version of SDL in Windows releases. --- cross_win32.txt | 2 +- cross_win64.txt | 2 +- prebuilt-deps/Makefile | 6 +++--- release.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cross_win32.txt b/cross_win32.txt index 826c044f..9bf974e3 100644 --- a/cross_win32.txt +++ b/cross_win32.txt @@ -20,4 +20,4 @@ ffmpeg_avcodec = 'avcodec-58' ffmpeg_avformat = 'avformat-58' ffmpeg_avutil = 'avutil-56' prebuilt_ffmpeg = 'ffmpeg-4.3.1-win32-shared' -prebuilt_sdl2 = 'SDL2-2.0.18/i686-w64-mingw32' +prebuilt_sdl2 = 'SDL2-2.0.20/i686-w64-mingw32' diff --git a/cross_win64.txt b/cross_win64.txt index 2e049fdb..763e12e9 100644 --- a/cross_win64.txt +++ b/cross_win64.txt @@ -20,4 +20,4 @@ ffmpeg_avcodec = 'avcodec-59' ffmpeg_avformat = 'avformat-59' ffmpeg_avutil = 'avutil-57' prebuilt_ffmpeg = 'ffmpeg-5.0-full_build-shared' -prebuilt_sdl2 = 'SDL2-2.0.18/x86_64-w64-mingw32' +prebuilt_sdl2 = 'SDL2-2.0.20/x86_64-w64-mingw32' diff --git a/prebuilt-deps/Makefile b/prebuilt-deps/Makefile index 93e8c48d..b40321b6 100644 --- a/prebuilt-deps/Makefile +++ b/prebuilt-deps/Makefile @@ -23,9 +23,9 @@ prepare-ffmpeg-win64: ffmpeg-5.0-full_build-shared prepare-sdl2: - @./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.18-mingw.tar.gz \ - bbad7c6947f6ca3e05292f065852ed8b62f319fc5533047e7708769c4dbae394 \ - SDL2-2.0.18 + @./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz \ + 38094d82a857d6c62352e5c5cdec74948c5b4d25c59cbd298d6d233568976bd1 \ + SDL2-2.0.20 prepare-adb: @./prepare-dep https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip \ diff --git a/release.mk b/release.mk index 6b361e5b..2f2fe9e1 100644 --- a/release.mk +++ b/release.mk @@ -102,7 +102,7 @@ dist-win32: build-server build-win32 cp 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.18/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp prebuilt-deps/SDL2-2.0.20/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" dist-win64: build-server build-win64 mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)" @@ -120,7 +120,7 @@ dist-win64: build-server build-win64 cp 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.18/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp prebuilt-deps/SDL2-2.0.20/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" zip-win32: dist-win32 cd "$(DIST)/$(WIN32_TARGET_DIR)"; \