]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Windows: use build-environment-supplied libSDL2 in developer builds
authordrjaska <drjaska83@gmail.com>
Thu, 21 Dec 2023 21:01:13 +0000 (23:01 +0200)
committerbones_was_here <bones_was_here@xonotic.au>
Mon, 25 Dec 2023 11:33:44 +0000 (21:33 +1000)
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

index 63f7fa718fbba0e18d48af0467c11091e24983a9..eb2bbe994b1d0cacc832add45a0c6dc2e8158f1d 100644 (file)
@@ -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