From 4d4ee4c185c9702521ca114aefeb85f3f2453125 Mon Sep 17 00:00:00 2001 From: drjaska Date: Thu, 21 Dec 2023 23:01:13 +0200 Subject: [PATCH] Windows: use build-environment-supplied libSDL2 in developer builds This requires developers to have installed SDL2 from MSYS2's `pacman` as documented in https://gitlab.com/xonotic/xonotic/-/wikis/Repository_Access Fixes failure to build current DP on Windows: the precompiled SDL2 in this repo is too old. Removes the need for manually maintaining that library and storing it in this repo. --- misc/tools/all/xonotic.subr | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 63f7fa71..eb2bbe99 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -138,16 +138,6 @@ case "$cmd" in fi if [ -n "$WE_HATE_OUR_USERS" ]; then - # win32: use SDL2 - case `uname -m` in - x86_64) - MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config" - ;; - *) - MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config" - ;; - esac - # win32: don't rely on jpeg includes MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG=" fi -- 2.39.2