# If we're targeting an x86 CPU we want to enable DP_SSE (CFLAGS_SSE and SSE2)
ifeq ($(DP_MAKE_TARGET), mingw)
DP_SSE:=1
+else ifeq ($(OS),Windows_NT)
+ ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
+ DP_SSE:=1
+ else ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
+ DP_SSE:=1
+ else ifeq ($(PROCESSOR_ARCHITECTURE),x86)
+ DP_SSE:=1
+ else
+ DP_SSE:=0
+ endif
else
DP_MACHINE:=$(shell uname -m)
ifeq ($(DP_MACHINE),x86_64)
DP_SSE:=1
- else
- ifeq ($(DP_MACHINE),i686)
+ else ifeq ($(DP_MACHINE),i686)
DP_SSE:=1
- else
- ifeq ($(DP_MACHINE),i386)
+ else ifeq ($(DP_MACHINE),i386)
DP_SSE:=1
else
DP_SSE:=0
- endif # ifeq ($(DP_MACHINE),i386)
- endif # ifeq ($(DP_MACHINE),i686)
- endif # ifeq ($(DP_MACHINE),x86_64)
+ endif
endif
# Makefile name
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=
EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+ DP_LINK_SDL?=shared
DP_LINK_ZLIB?=shared
DP_LINK_JPEG?=shared
- DP_LINK_ODE?=dlopen
+ DP_LINK_ODE?=
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+ DP_LINK_XMP?=dlopen
endif
# Mac OS X configuration
CFLAGS_MAKEDEP=
endif
+ DP_LINK_SDL?=shared
DP_LINK_ZLIB?=shared
DP_LINK_JPEG?=dlopen
- DP_LINK_ODE?=dlopen
+ DP_LINK_ODE?=
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
EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+ DP_LINK_SDL?=shared
DP_LINK_ZLIB?=shared
DP_LINK_JPEG?=shared
- DP_LINK_ODE?=dlopen
+ DP_LINK_ODE?=
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+ DP_LINK_XMP?=dlopen
endif
# BSD configuration
EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+ DP_LINK_SDL?=shared
DP_LINK_ZLIB?=shared
DP_LINK_JPEG?=shared
- DP_LINK_ODE?=dlopen
+ DP_LINK_ODE?=
DP_LINK_CRYPTO?=dlopen
DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+ DP_LINK_XMP?=dlopen
endif
# Win32 configuration
# 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
# 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 -Wwrite-strings -Wshadow -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
ifeq ($(DP_MAKE_TARGET), mingw)
EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
+ DP_LINK_SDL?=shared
DP_LINK_ZLIB?=dlopen
DP_LINK_JPEG?=shared
- DP_LINK_ODE?=dlopen
+ DP_LINK_ODE?=
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
# zlib
+ifeq ($(DP_LINK_SDL), shared)
+ SDL_LIBS=$(SDLCONFIG_LIBS)
+endif
+ifeq ($(DP_LINK_SDL), static)
+ SDL_LIBS=$(SDLCONFIG_STATICLIBS)
+endif
+
ifeq ($(DP_LINK_ZLIB), shared)
CFLAGS_LIBZ=-DLINK_TO_ZLIB
LIB_Z=-lz
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 #####
+ifneq ($(CC), tcc)
+ CFLAGS_MAKEDEP?=-MMD
+endif
-CFLAGS_MAKEDEP?=-MMD
ifdef DP_FS_BASEDIR
CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
else