Implement csqc "effect" builtin

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 70b297dce0de3cc9ebe2caf0a794b5ac26b87563..621c73e9fc55bdd782471eb74567e3dfa7a3b87c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -68,17 +68,17 @@ else
 endif
 
 # default targets
-TARGETS_DEBUG=sv-debug cl-debug sdl-debug
-TARGETS_PROFILE=sv-profile cl-profile sdl-profile
-TARGETS_RELEASE=sv-release cl-release sdl-release
-TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile
-TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz
+TARGETS_DEBUG=sv-debug sdl-debug
+TARGETS_PROFILE=sv-profile sdl-profile
+TARGETS_RELEASE=sv-release sdl-release
+TARGETS_RELEASE_PROFILE=sv-release-profile sdl-release-profile
+TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 
 ###### Optional features #####
 DP_VIDEO_CAPTURE?=enabled
 ifeq ($(DP_VIDEO_CAPTURE), enabled)
        CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
-       OBJ_VIDEO_CAPTURE= cap_avi.o cap_ogg.o
+       OBJ_VIDEO_CAPTURE=cap_avi.o cap_ogg.o
 else
        CFLAGS_VIDEO_CAPTURE=
        OBJ_VIDEO_CAPTURE=
@@ -106,6 +106,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # Mac OS X configuration
@@ -134,6 +135,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 
        # on OS X, we don't build the CL by default because it uses deprecated
        # and not-implemented-in-64bit Carbon
@@ -168,6 +170,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # BSD configuration
@@ -193,6 +196,7 @@ ifeq ($(DP_MAKE_TARGET), bsd)
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # Win32 configuration
@@ -200,7 +204,7 @@ ifeq ($(WIN32RELEASE), 1)
 #      TARGET=i686-pc-mingw32
 #      CC=$(TARGET)-g++
 #      WINDRES=$(TARGET)-windres
-       CPUOPTIMIZATIONS=-march=pentium3 -mfpmath=sse -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
+       CPUOPTIMIZATIONS=-march=pentium3 -mfpmath=sse -fno-math-errno -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 #       CPUOPTIMIZATIONS+=-DUSE_WSPIAPI_H -DSUPPORTIPV6
        LDFLAGS_WINCOMMON=-Wl,--large-address-aware
 else
@@ -213,9 +217,7 @@ ifeq ($(WIN64RELEASE), 1)
 #      WINDRES=$(TARGET)-windres
 endif
 
-CFLAGS_D3D=
-CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
-LDFLAGS_D3D=
+CFLAGS_WARNINGS=-Wall -Winline -Werror=c++-compat -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
 
 
 ifeq ($(DP_MAKE_TARGET), mingw)
@@ -239,6 +241,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+       DP_LINK_XMP?=dlopen
 endif
 
 # set these to "" if you want to use dynamic loading instead
@@ -291,6 +294,19 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
        CFLAGS_CRYPTO_RIJNDAEL=
 endif
 
+# xmp
+ifeq ($(DP_LINK_XMP), shared)
+       OBJ_SND_XMP=snd_xmp.o
+       LIB_SND_XMP=-lxmp
+       CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
+endif
+ifeq ($(DP_LINK_XMP), dlopen)
+       OBJ_SND_XMP=snd_xmp.o
+       LIB_SND_XMP=
+       CFLAGS_SND_XMP=-DUSEXMP
+endif
+
+
 ##### Extra CFLAGS #####
 
 CFLAGS_MAKEDEP?=-MMD