From a7075f312729c504909cb28c63ab639c805f43d8 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 22 Dec 2020 18:13:45 -0600 Subject: [PATCH] Update to SDL 2.0.14 --- SDL2 | 2 +- scripts/build-deps.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/SDL2 b/SDL2 index 863c4bd..4b160ce 160000 --- a/SDL2 +++ b/SDL2 @@ -1 +1 @@ -Subproject commit 863c4bd26b51892864c6042ad2db474e11b08fed +Subproject commit 4b160ce2c83048f10e34be0a91a18c92529d52a1 diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh index 96b8858..919246d 100755 --- a/scripts/build-deps.sh +++ b/scripts/build-deps.sh @@ -27,20 +27,16 @@ else fi # Build and install our SDL2 build -# Since we'll be linking statically, we need to use Libs.private instead of Libs, but -# there's no way to tell QMake to use the Libs.private section, so we have to replace -# Libs with Libs.private ourselves prior to installation. cd /opt/SDL2 ./configure --enable-static --disable-shared --enable-video-kmsdrm --disable-video-rpi make -j$(nproc) -sed -i '/^Libs:/d' sdl2.pc -sed -i 's/Libs.private:/Libs:/g' sdl2.pc cat sdl2.pc make install # Build and install SDL_ttf -# For similar reasons to SDL2 above, we have to patch the pkgconfig file in order to -# link with a static library. +# Since we'll be linking statically, we need to use Libs.private instead of Libs, but +# there's no way to tell QMake to use the Libs.private section, so we have to replace +# Libs with Libs.private ourselves prior to installation. cd /opt/SDL_ttf ./configure --enable-static --disable-shared make -j$(nproc)