X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=BSDmakefile;h=b98686dccb87bd85d723b4d3744eaf5ebc5b479b;hp=6ca3c655ea2315445804648ded01e6483f6fc173;hb=fbddb742e3f36efc25a5e701b2e29e14d24e5d75;hpb=221a6cb74c3a3b30b9e60247d6e42d7a6fcdebf0

diff --git a/BSDmakefile b/BSDmakefile
index 6ca3c655..b98686dc 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -16,29 +16,28 @@ CMD_CP=$(CMD_UNIXCP)
 CMD_MKDIR=$(CMD_UNIXMKDIR)
 
 # 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
+
+# Link options
+DP_LINK_ZLIB?=shared
+DP_LINK_JPEG?=shared
+DP_LINK_ODE?=
+DP_LINK_CRYPTO?=dlopen
+DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+DP_LINK_XMP?=dlopen
 
 ###### Optional features #####
-DP_CDDA?=enabled
-.if $(DP_CDDA) == "enabled"
-	OBJ_SDLCD=$(OBJ_CD_COMMON) cd_sdl.o
-	OBJ_BSDCD=$(OBJ_CD_COMMON) cd_bsd.o
-.else
-	OBJ_SDLCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-	OBJ_BSDCD=$(OBJ_CD_COMMON) $(OBJ_NOCD)
-.endif
-
 DP_VIDEO_CAPTURE?=enabled
-.if $(DP_VIDEO_CAPTURE == "enabled"
-	CFLAGS_VIDEO_CAPTURE=-DCONFIG_VIDEO_CAPTURE
-	OBJ_VIDEO_CAPTURE= cap_avi.o cap_ogg.o
+.if $(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=
+  CFLAGS_VIDEO_CAPTURE=
+  OBJ_VIDEO_CAPTURE=
 .endif
 
 # X11 libs
@@ -53,13 +52,10 @@ 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)
 
@@ -67,63 +63,67 @@ 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)
 
 # set these to "" if you want to use dynamic loading instead
 # zlib
+.if $(DP_LINK_ZLIB) == "shared"
 CFLAGS_LIBZ=-DLINK_TO_ZLIB
 LIB_Z=-lz
+.else
+CFLAGS_LIBZ=
+LIB_Z=
+.endif
 
 # jpeg
+.if $(DP_LINK_JPEG) == "shared"
 CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
 LIB_JPEG=-ljpeg
+.else
+CFLAGS_LIBJPEG=
+LIB_JPEG=
+.endif
 
 # ode
+.if $(DP_LINK_ODE) == "shared"
 ODE_CONFIG?=ode-config
 LIB_ODE=`$(ODE_CONFIG) --libs`
 CFLAGS_ODE=`$(ODE_CONFIG) --cflags` -DUSEODE -DLINK_TO_LIBODE
+.else
+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
+.if $(DP_LINK_CRYPTO) == "shared"
+LIB_CRYPTO=-ld0_blind_id
+CFLAGS_CRYPTO=-DLINK_TO_CRYPTO
+.else
 LIB_CRYPTO=
 CFLAGS_CRYPTO=
+.endif
+.if $(DP_LINK_CRYPTO_RIJNDAEL) == "shared"
+LIB_CRYPTO_RIJNDAEL=-ld0_rijndael
+CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
+.else
 LIB_CRYPTO_RIJNDAEL=
 CFLAGS_CRYPTO_RIJNDAEL=
-
-.endif
-
-
-##### Sound configuration #####
-
-.ifndef DP_SOUND_API
-DP_SOUND_API=$(DEFAULT_SNDAPI)
 .endif
 
-# NULL: no sound
-.if $(DP_SOUND_API) == "NULL"
-OBJ_SOUND=$(OBJ_SND_NULL)
-LIB_SOUND=$(LIB_SND_NULL)
-.endif
-
-# OSS: Open Sound System
-.if $(DP_SOUND_API) == "OSS"
-OBJ_SOUND=$(OBJ_SND_OSS)
-LIB_SOUND=$(LIB_SND_OSS)
+# xmp
+.if $(DP_LINK_XMP) == "shared"
+OBJ_SND_XMP=snd_xmp.o
+LIB_SND_XMP=-lxmp
+CFLAGS_SND_XMP=-DUSEXMP -DLINK_TO_LIBXMP
+.else
+OBJ_SND_XMP=snd_xmp.o
+LIB_SND_XMP=
+CFLAGS_SND_XMP=-DUSEXMP
 .endif
 
-# BSD: BSD / Sun audio API
-.if $(DP_SOUND_API) == "BSD"
-OBJ_SOUND=$(OBJ_SND_BSD)
-LIB_SOUND=$(LIB_SND_BSD)
 .endif
 
 
@@ -138,12 +138,14 @@ CFLAGS_FS=
 
 CFLAGS_PRELOAD=
 .ifdef DP_PRELOAD_DEPENDENCIES
-LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD)
 LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
 LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
 CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
 .endif
 
+CFLAGS_NET=
+# Systems without IPv6 support should uncomment this:
+#CFLAGS_NET+=-DNOSUPPORTIPV6
 
 ##### BSD Make specific definitions #####