From: bones_was_here <bones_was_here@xonotic.au>
Date: Wed, 27 Dec 2023 05:39:46 +0000 (+1000)
Subject: Use default (shared linking) instead of dlopen for libjpeg in Windows dev/git builds
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99b6a58dea3bbd5eb3cbf3186d0783fc487b3847;p=xonotic%2Fxonotic.git

Use default (shared linking) instead of dlopen for libjpeg in Windows dev/git builds
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index ed698686..22b873d5 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -137,11 +137,6 @@ case "$cmd" in
 			MAKEFLAGS=-$(echo $MAKEFLAGS)                  # echo here and above will trim whitespaces
 		fi
 
-		if [ -n "$WE_HATE_OUR_USERS" ]; then
-			# win32: don't rely on jpeg includes
-			MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
-		fi
-
 		if [ x"`uname`" = x"Darwin" ]; then
 			# osx: use SDL2
 			f=$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks