use multiple prints for ProQuake compatibility in status commands

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 4423d411dc2a0cbc39c8615fb5b2dcfddd42d732..f137e9f3ddc65fb82f0ff2a13fcdc98b1c0523cb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -183,6 +183,14 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
+ifeq ($(WIN32RELEASE), 1)
+       CPUOPTIMIZATIONS=-march=i686 -DSUPPORTDIRECTX -DUSE_WSPIAPI_H
+endif
+
+ifeq ($(WIN64RELEASE), 1)
+       CPUOPTIMIZATIONS=
+endif
+
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -199,18 +207,12 @@ endif
 ifeq ($(DP_SOUND_API), OSS)
        OBJ_SOUND=$(OBJ_SND_OSS)
        LIB_SOUND=$(LIB_SND_OSS)
-       ifneq ($(shell [ -e /usr/lib64/libmodplug.a ] || [ -e /usr/lib/libmodplug.a ]), false)
-               LIB_SOUND+=-lmodplug -lstdc++
-       endif
 endif
 
 # ALSA: Advanced Linux Sound Architecture
 ifeq ($(DP_SOUND_API), ALSA)
        OBJ_SOUND=$(OBJ_SND_ALSA)
        LIB_SOUND=$(LIB_SND_ALSA)
-       ifneq ($(shell [ -e /usr/lib64/libmodplug.a ] || [ -e /usr/lib/libmodplug.a ]), false)
-               LIB_SOUND+=-lmodplug -lstdc++
-       endif
 endif
 
 # COREAUDIO: Core Audio
@@ -231,10 +233,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
@@ -253,6 +259,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)