migrate the libjpeg options to per-target scripting, and default the

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index b5a31da7c85a1cb38deb6f48fa6a3241aa53cfbf..4dead01dea1b03dc1f4f35146c038e2b757aec8a 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -177,10 +177,6 @@ OBJ_SV= builddate.c sys_linux.o vid_null.o $(OBJ_SND_NULL) $(OBJ_NOCD) $(OBJ_COM
 OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(OBJ_COMMON)
 
 
-# libjpeg dependency (set these to "" if you want to use dynamic loading instead)
-CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
-LIB_JPEG=-ljpeg
-
 # Compilation
 CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_CG) $(CFLAGS_WARNINGS) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D)
 CFLAGS_DEBUG=-ggdb