endif # ifdef windir
endif # ifndef DP_MAKE_TARGET
-# If we're not on compiling for Win32, we need additional information
-ifneq ($(DP_MAKE_TARGET), mingw)
- DP_ARCH:=$(shell uname)
+# 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
DP_MACHINE:=$(shell uname -m)
+ ifeq ($(DP_MACHINE),x86_64)
+ DP_SSE:=1
+ else
+ ifeq ($(DP_MACHINE),i686)
+ DP_SSE:=1
+ 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
# 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_CDDA?=enabled
-ifeq ($(DP_CDDA), enabled)
- OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o
- OBJ_LINUXCD=$(OBJ_CD_COMMON) cd_linux.o
- OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o
- OBJ_WINCD=$(OBJ_CD_COMMON) cd_win.o
-else
- OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
- OBJ_LINUXCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
- OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
- OBJ_WINCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-endif
-
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=
# Linux configuration
ifeq ($(DP_MAKE_TARGET), linux)
- DEFAULT_SNDAPI=ALSA
- OBJ_CD=$(OBJ_LINUXCD)
-
- OBJ_CL=$(OBJ_GLX)
OBJ_ICON=
OBJ_ICON_NEXUIZ=
- LDFLAGS_CL=$(LDFLAGS_LINUXCL)
LDFLAGS_SV=$(LDFLAGS_LINUXSV)
LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
- EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
- EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
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
ifeq ($(DP_MAKE_TARGET), macosx)
- DEFAULT_SNDAPI=COREAUDIO
- OBJ_CD=$(OBJ_MACOSXCD)
-
- OBJ_CL=$(OBJ_AGL)
OBJ_ICON=
OBJ_ICON_NEXUIZ=
- LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS)
SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS)
- EXE_CL=$(EXE_MACOSXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
- EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ)
EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
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
# SunOS configuration (Solaris)
ifeq ($(DP_MAKE_TARGET), sunos)
- DEFAULT_SNDAPI=BSD
- OBJ_CD=$(OBJ_SUNOSCD)
-
- OBJ_CL=$(OBJ_GLX)
OBJ_ICON=
OBJ_ICON_NEXUIZ=
CFLAGS_EXTRA=$(CFLAGS_SUNOS)
- LDFLAGS_CL=$(LDFLAGS_SUNOSCL)
LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
- EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
- EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
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
ifeq ($(DP_MAKE_TARGET), bsd)
-ifeq ($(DP_ARCH),FreeBSD)
- DEFAULT_SNDAPI=OSS
-else
- DEFAULT_SNDAPI=BSD
-endif
- OBJ_CD=$(OBJ_BSDCD)
- OBJ_CL=$(OBJ_GLX)
OBJ_ICON=
OBJ_ICON_NEXUIZ=
- LDFLAGS_CL=$(LDFLAGS_BSDCL)
LDFLAGS_SV=$(LDFLAGS_BSDSV)
LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
- EXE_CL=$(EXE_UNIXCL)
EXE_SV=$(EXE_UNIXSV)
EXE_SDL=$(EXE_UNIXSDL)
- EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
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
-ifeq ($(D3D), 1)
- CFLAGS_D3D=-DSUPPORTD3D -DSUPPORTDIRECTX
- CFLAGS_WARNINGS=-Wall
- LDFLAGS_D3D=-ld3d9
-else
- CFLAGS_D3D=
- CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement -Wmissing-prototypes
- LDFLAGS_D3D=
-endif
+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)
- DEFAULT_SNDAPI=WIN
- OBJ_CD=$(OBJ_WINCD)
-
- OBJ_CL=$(OBJ_WGL)
OBJ_ICON=darkplaces.o
OBJ_ICON_NEXUIZ=nexuiz.o
- LDFLAGS_CL=$(LDFLAGS_WINCL)
LDFLAGS_SV=$(LDFLAGS_WINSV)
LDFLAGS_SDL=$(LDFLAGS_WINSDL)
SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
- EXE_CL=$(EXE_WINCL)
EXE_SV=$(EXE_WINSV)
EXE_SDL=$(EXE_WINSDL)
- EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
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
-##### Sound configuration #####
-
-ifndef DP_SOUND_API
- DP_SOUND_API=$(DEFAULT_SNDAPI)
-endif
-
-# NULL: no sound
-ifeq ($(DP_SOUND_API), NULL)
- OBJ_SOUND=$(OBJ_SND_NULL)
- LIB_SOUND=$(LIB_SND_NULL)
+# xmp
+ifeq ($(DP_LINK_XMP), shared)
+ OBJ_SND_XMP=snd_xmp.o
+ LIB_SND_XMP=-lxmp
+ CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
endif
-
-# OSS: Open Sound System
-ifeq ($(DP_SOUND_API), OSS)
- OBJ_SOUND=$(OBJ_SND_OSS)
- LIB_SOUND=$(LIB_SND_OSS)
-endif
-
-# ALSA: Advanced Linux Sound Architecture
-ifeq ($(DP_SOUND_API), ALSA)
- OBJ_SOUND=$(OBJ_SND_ALSA)
- LIB_SOUND=$(LIB_SND_ALSA)
+ifeq ($(DP_LINK_XMP), dlopen)
+ OBJ_SND_XMP=snd_xmp.o
+ LIB_SND_XMP=
+ CFLAGS_SND_XMP=-DUSEXMP
endif
-# COREAUDIO: Core Audio
-ifeq ($(DP_SOUND_API), COREAUDIO)
- OBJ_SOUND=$(OBJ_SND_COREAUDIO)
- LIB_SOUND=$(LIB_SND_COREAUDIO)
-endif
-
-# BSD: BSD / Sun audio API
-ifeq ($(DP_SOUND_API), BSD)
- OBJ_SOUND=$(OBJ_SND_BSD)
- LIB_SOUND=$(LIB_SND_BSD)
-endif
-
-# WIN: DirectX and Win32 WAVE output
-ifeq ($(DP_SOUND_API), WIN)
- OBJ_SOUND=$(OBJ_SND_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 #####
+ifneq ($(CC), tcc)
+ CFLAGS_MAKEDEP?=-MMD
+endif
-CFLAGS_MAKEDEP?=-MMD
ifdef DP_FS_BASEDIR
CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
else
projects / xonotic / darkplaces.git / blobdiff