Patch by FruitieX -- fixes speed

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 479d62bc0b282cd410dc953692e7b0fbdfc4c239..4112001b6370f745356c7d1a0303c3f3c81eeeec 100644 (file)
--- a/makefile
+++ b/makefile
@@ -61,6 +61,10 @@ ifeq ($(DP_MAKE_TARGET), linux)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)
        LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
@@ -82,6 +86,10 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
        LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_MACOSXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS)
+
        EXE_CL=$(EXE_MACOSXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
@@ -109,6 +117,10 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
        LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
@@ -134,6 +146,10 @@ endif
        LDFLAGS_SV=$(LDFLAGS_BSDSV)
        LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
@@ -155,6 +171,10 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        LDFLAGS_SV=$(LDFLAGS_WINSV)
        LDFLAGS_SDL=$(LDFLAGS_WINSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
        EXE_CL=$(EXE_WINCL)
        EXE_SV=$(EXE_WINSV)
        EXE_SDL=$(EXE_WINSDL)
@@ -205,10 +225,14 @@ ifeq ($(DP_SOUND_API), WIN)
        LIB_SOUND=$(LIB_SND_WIN)
 endif
 
+ifeq ($(DP_SOUND_API),3DRAS)
+       OBJ_SOUND=$(OBJ_SND_3DRAS)
+       LIB_SOUND=$(LIB_SND_3DRAS)
+endif
 
 ##### Extra CFLAGS #####
 
-CFLAGS_MAKEDEP?=-MD
+CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
        CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
 else
@@ -227,6 +251,14 @@ ifdef DP_PRELOAD_DEPENDENCIES
 endif
 endif
 
+ifdef DP_LINK_TO_LIBJPEG
+       LDFLAGS_LIBJPEG?=-ljpeg
+       LDFLAGS_CL+=$(LDFLAGS_LIBJPEG)
+       LDFLAGS_SV+=$(LDFLAGS_LIBJPEG)
+       LDFLAGS_SDL+=$(LDFLAGS_LIBJPEG)
+       CFLAGS_PRELOAD+=$(CFLAGS_LIBJPEG) -DLINK_TO_LIBJPEG
+endif
+
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)