X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=973113d1a375231d56665e4d306f2479a9e961bd;hp=ff3e165cd07f8a1c613d9aef2507450ef8ce0c6c;hb=HEAD;hpb=4f1a1c642316d2f85a4073eb969f962f24ed647b

diff --git a/makefile b/makefile
index ff3e165c..b62194cd 100644
--- a/makefile
+++ b/makefile
@@ -26,10 +26,30 @@ endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
 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 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)
+		DP_SSE:=1
+	else ifeq ($(DP_MACHINE),i386)
+		DP_SSE:=1
+	else
+		DP_SSE:=0
+	endif
 endif
 
 # Makefile name
@@ -46,38 +66,19 @@ else
 	CMD_MKDIR=$(CMD_UNIXMKDIR)
 endif
 
-# 64bits AMD CPUs use another lib directory
-ifeq ($(DP_MACHINE),x86_64)
-	UNIX_X11LIBPATH:=/usr/X11R6/lib64
-else
-	UNIX_X11LIBPATH:=/usr/X11R6/lib
-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
 
+###### 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=
@@ -85,14 +86,9 @@ endif
 
 # 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)
 
@@ -100,29 +96,25 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	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)
 
@@ -130,10 +122,8 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	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)
 
@@ -141,13 +131,14 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 		CFLAGS_MAKEDEP=
 	endif
 
+	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=shared
-	DP_LINK_JPEG?=shared
-	DP_LINK_ODE?=dlopen
+	DP_LINK_JPEG?=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
 	TARGETS_DEBUG=sv-debug sdl-debug
 	TARGETS_PROFILE=sv-profile sdl-profile
 	TARGETS_RELEASE=sv-release sdl-release
@@ -157,16 +148,11 @@ endif
 
 # 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)
 
@@ -174,33 +160,26 @@ ifeq ($(DP_MAKE_TARGET), sunos)
 	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)
 
@@ -208,57 +187,25 @@ endif
 	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
-ifeq ($(WIN32RELEASE), 1)
-#	TARGET=i686-pc-mingw32
-#	CC=$(TARGET)-g++
-#	WINDRES=$(TARGET)-windres
-	CPUOPTIMIZATIONS=-march=i686 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
-#       CPUOPTIMIZATIONS+=-DUSE_WSPIAPI_H -DSUPPORTIPV6
-	LDFLAGS_WINCOMMON=-Wl,--large-address-aware
-else
-	LDFLAGS_WINCOMMON=
-endif
-
-ifeq ($(WIN64RELEASE), 1)
-#	TARGET=x86_64-pc-mingw32
-#	CC=$(TARGET)-g++
-#	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
-
-
 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)
 
@@ -266,26 +213,49 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	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
+
+
+##### Library linking #####
+# SDL2
+SDL_CONFIG?=sdl2-config
+SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags`
+SDLCONFIG_UNIXCFLAGS_X11?=
+SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
+SDLCONFIG_UNIXLIBS_X11?=-lX11
+SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
+SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
+SDLCONFIG_MACOSXCFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+SDLCONFIG_MACOSXLIBS=$(SDLCONFIG_UNIXLIBS)
+SDLCONFIG_MACOSXSTATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+ifeq ($(DP_LINK_SDL), shared)
+	SDL_LIBS=$(SDLCONFIG_LIBS)
+else ifeq ($(DP_LINK_SDL), static)
+	SDL_LIBS=$(SDLCONFIG_STATICLIBS)
+else ifeq ($(DP_LINK_SDL), dlopen)
+  $(error libSDL2 can only be used with shared or static linking)
 endif
 
-# set these to "" if you want to use dynamic loading instead
 # zlib
 ifeq ($(DP_LINK_ZLIB), shared)
 	CFLAGS_LIBZ=-DLINK_TO_ZLIB
 	LIB_Z=-lz
-endif
-ifeq ($(DP_LINK_ZLIB), dlopen)
+else ifeq ($(DP_LINK_ZLIB), static)
+	CFLAGS_LIBZ=-DLINK_TO_ZLIB
+	LIB_Z=-l:libz.a
+else ifeq ($(DP_LINK_ZLIB), dlopen)
 	CFLAGS_LIBZ=
 	LIB_Z=
 endif
@@ -294,8 +264,10 @@ endif
 ifeq ($(DP_LINK_JPEG), shared)
 	CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
 	LIB_JPEG=-ljpeg
-endif
-ifeq ($(DP_LINK_JPEG), dlopen)
+else ifeq ($(DP_LINK_JPEG), static)
+	CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+	LIB_JPEG=-l:libjpeg.a
+else ifeq ($(DP_LINK_JPEG), dlopen)
 	CFLAGS_LIBJPEG=
 	LIB_JPEG=
 endif
@@ -305,8 +277,12 @@ ifeq ($(DP_LINK_ODE), shared)
 	ODE_CONFIG?=ode-config
 	LIB_ODE=`$(ODE_CONFIG) --libs`
 	CFLAGS_ODE=`$(ODE_CONFIG) --cflags` -DUSEODE -DLINK_TO_LIBODE
-endif
-ifeq ($(DP_LINK_ODE), dlopen)
+else ifeq ($(DP_LINK_ODE), static)
+	# This is the configuration from Xonotic
+	ODE_CONFIG?=ode-config
+	LIB_ODE=-l:libode.a -lstdc++ -pthread
+	CFLAGS_ODE=-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE
+else ifeq ($(DP_LINK_ODE), dlopen)
 	LIB_ODE=
 	CFLAGS_ODE=-DUSEODE
 endif
@@ -315,66 +291,46 @@ endif
 ifeq ($(DP_LINK_CRYPTO), shared)
 	LIB_CRYPTO=-ld0_blind_id
 	CFLAGS_CRYPTO=-DLINK_TO_CRYPTO
-	LIB_CRYPTO_RIJNDAEL=-ld0_rijndael
-	CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
-endif
-ifeq ($(DP_LINK_CRYPTO), dlopen)
+else ifeq ($(DP_LINK_CRYPTO), static)
+	LIB_CRYPTO=-l:libd0_blind_id.a -lgmp
+	CFLAGS_CRYPTO=-DLINK_TO_CRYPTO
+else ifeq ($(DP_LINK_CRYPTO), static_inc_gmp)
+	LIB_CRYPTO=-l:libd0_blind_id.a -l:libgmp.a
+	CFLAGS_CRYPTO=-DLINK_TO_CRYPTO
+else ifeq ($(DP_LINK_CRYPTO), dlopen)
 	LIB_CRYPTO=
 	CFLAGS_CRYPTO=
-	LIB_CRYPTO_RIJNDAEL=
-	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)
 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)
-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)
+# d0_rijndael
+ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared)
+	LIB_CRYPTO_RIJNDAEL=-ld0_rijndael
+	CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
+else ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), static)
+	LIB_CRYPTO_RIJNDAEL=-l:libd0_rijndael.a
+	CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
+else ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
+	LIB_CRYPTO_RIJNDAEL=
+	CFLAGS_CRYPTO_RIJNDAEL=
 endif
 
-# WIN: DirectX and Win32 WAVE output
-ifeq ($(DP_SOUND_API), WIN)
-	OBJ_SOUND=$(OBJ_SND_WIN)
-	LIB_SOUND=$(LIB_SND_WIN)
+# xmp
+ifeq ($(DP_LINK_XMP), shared)
+	OBJ_SND_XMP=snd_xmp.o
+	LIB_SND_XMP=-lxmp
+	CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
+else ifeq ($(DP_LINK_XMP), static)
+	OBJ_SND_XMP=snd_xmp.o
+	LIB_SND_XMP=-l:libxmp.a
+	CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
+else ifeq ($(DP_LINK_XMP), dlopen)
+	OBJ_SND_XMP=snd_xmp.o
+	LIB_SND_XMP=
+	CFLAGS_SND_XMP=-DUSEXMP
 endif
 
-ifeq ($(DP_SOUND_API),3DRAS)
-	OBJ_SOUND=$(OBJ_SND_3DRAS)
-	LIB_SOUND=$(LIB_SND_3DRAS)
-endif
 
 ##### Extra CFLAGS #####
-
-CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
 	CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\"
 else
@@ -393,6 +349,11 @@ ifdef DP_PRELOAD_DEPENDENCIES
 endif
 endif
 
+CFLAGS_NET=
+# Systems without IPv6 support should uncomment this:
+#CFLAGS_NET+=-DNOSUPPORTIPV6
+
+
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS)