X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=064a6e7b99d41c8cd387a8f981cad3ef143048e4;hp=184029d9e625d4edd1a8b4baa2ed4b5016c424bb;hb=8a4f0205f0d377eb77a0f045c6ae02a04e6ed671;hpb=9af5c9a87d7cddc6268fe5a13f6805ab242e38d8 diff --git a/makefile b/makefile index 184029d9..064a6e7b 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ ifndef DP_MAKE_TARGET # Win32 -ifdef windir +ifdef WINDIR DP_MAKE_TARGET=mingw else @@ -26,18 +26,38 @@ 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 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 +MAKEFILE=makefile -# Command used to delete files +# Commands ifdef windir CMD_RM=del + CMD_CP=copy /y + CMD_MKDIR=mkdir else CMD_RM=$(CMD_UNIXRM) + CMD_CP=$(CMD_UNIXCP) + CMD_MKDIR=$(CMD_UNIXMKDIR) endif # 64bits AMD CPUs use another lib directory @@ -47,42 +67,54 @@ else UNIX_X11LIBPATH:=/usr/X11R6/lib endif +# default targets +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 +else + CFLAGS_VIDEO_CAPTURE= + OBJ_VIDEO_CAPTURE= +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) - SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + 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?= + 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) @@ -90,84 +122,112 @@ 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) ifeq ($(word 2, $(filter -arch, $(CC))), -arch) CFLAGS_MAKEDEP= endif + + DP_LINK_SDL?=shared + DP_LINK_ZLIB?=shared + 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 + TARGETS_RELEASE_PROFILE=sv-release-profile sdl-release-profile + TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz 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) - SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + 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?= + 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_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) - SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) - SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) + SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11) + 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?= + DP_LINK_CRYPTO?=dlopen + DP_LINK_CRYPTO_RIJNDAEL?=dlopen + DP_LINK_XMP?=dlopen endif # Win32 configuration -ifeq ($(DP_MAKE_TARGET), mingw) - DEFAULT_SNDAPI=WIN - OBJ_CD=$(OBJ_WINCD) +ifeq ($(WIN32RELEASE), 1) +# TARGET=i686-pc-mingw32 +# CC=$(TARGET)-g++ +# WINDRES=$(TARGET)-windres + 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 + LDFLAGS_WINCOMMON= +endif + +ifeq ($(WIN64RELEASE), 1) +# TARGET=x86_64-pc-mingw32 +# CC=$(TARGET)-g++ +# WINDRES=$(TARGET)-windres +endif - OBJ_CL=$(OBJ_WGL) +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) OBJ_ICON=darkplaces.o OBJ_ICON_NEXUIZ=nexuiz.o - LDFLAGS_CL=$(LDFLAGS_WINCL) LDFLAGS_SV=$(LDFLAGS_WINSV) LDFLAGS_SDL=$(LDFLAGS_WINSDL) @@ -175,71 +235,97 @@ 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) -endif -ifeq ($(WIN32RELEASE), 1) - CPUOPTIMIZATIONS=-march=i686 - CFLAGS_RELEASE="-DSUPPORTDIRECTX -DUSE_WSPIAPI_H" + DP_LINK_SDL?=shared + DP_LINK_ZLIB?=dlopen + DP_LINK_JPEG?=shared + DP_LINK_ODE?= + DP_LINK_CRYPTO?=dlopen + DP_LINK_CRYPTO_RIJNDAEL?=dlopen + DP_LINK_XMP?=dlopen endif -##### Sound configuration ##### - -ifndef DP_SOUND_API - DP_SOUND_API=$(DEFAULT_SNDAPI) +# set these to "" if you want to use dynamic loading instead +# zlib +ifeq ($(DP_LINK_SDL), shared) + SDL_LIBS=$(SDLCONFIG_LIBS) endif - -# NULL: no sound -ifeq ($(DP_SOUND_API), NULL) - OBJ_SOUND=$(OBJ_SND_NULL) - LIB_SOUND=$(LIB_SND_NULL) +ifeq ($(DP_LINK_SDL), static) + SDL_LIBS=$(SDLCONFIG_STATICLIBS) endif -# OSS: Open Sound System -ifeq ($(DP_SOUND_API), OSS) - OBJ_SOUND=$(OBJ_SND_OSS) - LIB_SOUND=$(LIB_SND_OSS) +ifeq ($(DP_LINK_ZLIB), shared) + CFLAGS_LIBZ=-DLINK_TO_ZLIB + LIB_Z=-lz endif - -# ALSA: Advanced Linux Sound Architecture -ifeq ($(DP_SOUND_API), ALSA) - OBJ_SOUND=$(OBJ_SND_ALSA) - LIB_SOUND=$(LIB_SND_ALSA) +ifeq ($(DP_LINK_ZLIB), dlopen) + CFLAGS_LIBZ= + LIB_Z= endif -# COREAUDIO: Core Audio -ifeq ($(DP_SOUND_API), COREAUDIO) - OBJ_SOUND=$(OBJ_SND_COREAUDIO) - LIB_SOUND=$(LIB_SND_COREAUDIO) +# jpeg +ifeq ($(DP_LINK_JPEG), shared) + CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG + LIB_JPEG=-ljpeg +endif +ifeq ($(DP_LINK_JPEG), dlopen) + CFLAGS_LIBJPEG= + LIB_JPEG= endif -# BSD: BSD / Sun audio API -ifeq ($(DP_SOUND_API), BSD) - OBJ_SOUND=$(OBJ_SND_BSD) - LIB_SOUND=$(LIB_SND_BSD) +# ode +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) + LIB_ODE= + CFLAGS_ODE=-DUSEODE endif -# WIN: DirectX and Win32 WAVE output -ifeq ($(DP_SOUND_API), WIN) - OBJ_SOUND=$(OBJ_SND_WIN) - LIB_SOUND=$(LIB_SND_WIN) +# d0_blind_id +ifeq ($(DP_LINK_CRYPTO), shared) + LIB_CRYPTO=-ld0_blind_id + CFLAGS_CRYPTO=-DLINK_TO_CRYPTO +endif +ifeq ($(DP_LINK_CRYPTO), dlopen) + LIB_CRYPTO= + CFLAGS_CRYPTO= +endif +ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared) + LIB_CRYPTO_RIJNDAEL=-ld0_rijndael + CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL +endif +ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen) + LIB_CRYPTO_RIJNDAEL= + CFLAGS_CRYPTO_RIJNDAEL= endif -ifeq ($(DP_SOUND_API),3DRAS) - OBJ_SOUND=$(OBJ_SND_3DRAS) - LIB_SOUND=$(LIB_SND_3DRAS) +# 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)\"' + CFLAGS_FS=-DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\" else CFLAGS_FS= endif @@ -256,17 +342,13 @@ 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 +CFLAGS_NET= +# Systems without IPv6 support should uncomment this: +#CFLAGS_NET+=-DNOSUPPORTIPV6 ##### GNU Make specific definitions ##### -DO_LD=$(CC) -o $@ $^ $(LDFLAGS) +DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS) ##### Definitions shared by all makefiles ##### @@ -276,3 +358,10 @@ include makefile.inc ##### Dependency files ##### -include *.d + +# hack to deal with no-longer-needed .h files +%.h: + @echo + @echo "NOTE: file $@ mentioned in dependencies missing, continuing..." + @echo "HINT: consider 'make clean'" + @echo