X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=920a9e84b9c0a51f18f53b27be632ed011e92751;hp=e6c048a030ddcc2ac5d62e0a4c83b307a7a9a926;hb=7df12163f2fe3193d5709ae8172eeaa5e92933b5;hpb=3dee14d7eae45873695df7e77eb244d76d372361 diff --git a/makefile b/makefile index e6c048a0..920a9e84 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ ifndef DP_MAKE_TARGET # Win32 -ifdef windir +ifdef WINDIR DP_MAKE_TARGET=mingw else @@ -47,6 +47,12 @@ 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 # Linux configuration ifeq ($(DP_MAKE_TARGET), linux) @@ -61,9 +67,9 @@ ifeq ($(DP_MAKE_TARGET), linux) 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) @@ -71,6 +77,8 @@ ifeq ($(DP_MAKE_TARGET), linux) EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) + + DP_LINK_LIBS=shared endif # Mac OS X configuration @@ -100,6 +108,16 @@ ifeq ($(DP_MAKE_TARGET), macosx) ifeq ($(word 2, $(filter -arch, $(CC))), -arch) CFLAGS_MAKEDEP= endif + + DP_LINK_LIBS=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) @@ -117,9 +135,9 @@ ifeq ($(DP_MAKE_TARGET), sunos) 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) @@ -127,6 +145,8 @@ ifeq ($(DP_MAKE_TARGET), sunos) EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) + + DP_LINK_LIBS=shared endif # BSD configuration @@ -146,9 +166,9 @@ endif 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) @@ -156,9 +176,39 @@ endif EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ) + + DP_LINK_LIBS=shared 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) @@ -181,12 +231,60 @@ ifeq ($(DP_MAKE_TARGET), mingw) EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ) EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ) EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ) + + DP_LINK_LIBS=shared endif -ifeq ($(WIN32RELEASE), 1) - CPUOPTIMIZATIONS=-march=i686 -DSUPPORTDIRECTX -DUSE_WSPIAPI_H +# set these to "" if you want to use dynamic loading instead +# zlib +ifeq ($(DP_LINK_LIBS), shared) + CFLAGS_LIBZ=-DLINK_TO_ZLIB + LIB_Z=-lz +endif +ifeq ($(DP_LINK_LIBS), dlopen) + CFLAGS_LIBZ= + LIB_Z= endif +# jpeg +ifeq ($(DP_LINK_LIBS), shared) + CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG + LIB_JPEG=-ljpeg +endif +ifeq ($(DP_LINK_LIBS), dlopen) + CFLAGS_LIBJPEG= + LIB_JPEG= +endif + +# ode +ifeq ($(DP_LINK_LIBS), shared) + ODE_CONFIG?=ode-config + LIB_ODE=`$(ODE_CONFIG) --libs` + CFLAGS_ODE=`$(ODE_CONFIG) --cflags` -DUSEODE -DLINK_TO_LIBODE +endif +ifeq ($(DP_LINK_LIBS), dlopen) + LIB_ODE= + CFLAGS_ODE=-DUSEODE +endif + +# d0_blind_id +# most distros do not have d0_blind_id package, dlopen will used by default +# LIB_CRYPTO=-ld0_blind_id +# CFLAGS_CRYPTO=-DLINK_TO_CRYPTO +# LIB_CRYPTO_RIJNDAEL=-ld0_rijndael +# CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL +LIB_CRYPTO= +CFLAGS_CRYPTO= +LIB_CRYPTO_RIJNDAEL= +CFLAGS_CRYPTO_RIJNDAEL= + +# modplug +# now ogg is mostly used, modplug is required rarely, keep it dlopen by default +# LIB_SND_MODPLUG=-lmodplug +# CFLAGS_SND_MODPLUG=-DLINK_TO_LIBMODPLUG +LIB_SND_MODPLUG= +CFLAGS_SND_MODPLUG= + ##### Sound configuration ##### ifndef DP_SOUND_API @@ -255,14 +353,6 @@ 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 - ##### GNU Make specific definitions ##### DO_LD=$(CC) -o $@ $^ $(LDFLAGS) @@ -275,3 +365,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