Fix setinfo.

[xonotic/darkplaces.git] / BSDmakefile

diff --git a/BSDmakefile b/BSDmakefile
index 24012acb4743f5d8e7e6b1a33a3d4973b8da4cbb..b6cebea7de804184b8e0746802c64de28f772a2d 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,9 +7,39 @@ DP_MAKE_TARGET=bsd
 .endif
 DP_ARCH != uname
 
 .endif
 DP_ARCH != uname
 

-# Command used to delete files
+# Makefile name
+MAKEFILE=BSDmakefile
+
+# Commands

 CMD_RM=$(CMD_UNIXRM)
 CMD_RM=$(CMD_UNIXRM)

+CMD_CP=$(CMD_UNIXCP)
+CMD_MKDIR=$(CMD_UNIXMKDIR)
+
+# 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
+
+# Link options
+DP_LINK_ZLIB?=shared
+DP_LINK_JPEG?=shared
+DP_LINK_ODE?=dlopen
+DP_LINK_CRYPTO?=dlopen
+DP_LINK_CRYPTO_RIJNDAEL?=dlopen
+
+###### Optional features #####
+DP_VIDEO_CAPTURE?=enabled
+.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 =
+.endif

 
 

+# X11 libs

 UNIX_X11LIBPATH=/usr/X11R6/lib
 
 # BSD configuration
 UNIX_X11LIBPATH=/usr/X11R6/lib
 
 # BSD configuration


@@ -21,52 +51,67 @@ DEFAULT_SNDAPI=OSS
 .else
 DEFAULT_SNDAPI=BSD
 .endif
 .else
 DEFAULT_SNDAPI=BSD
 .endif

-OBJ_CD=$(OBJ_BSDCD)

 
 

-OBJ_CL=$(OBJ_GLX)

 OBJ_ICON=
 OBJ_ICON_NEXUIZ=
 
 OBJ_ICON=
 OBJ_ICON_NEXUIZ=
 

-LDFLAGS_CL=$(LDFLAGS_BSDCL)

 LDFLAGS_SV=$(LDFLAGS_BSDSV)
 LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
 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_SV=$(EXE_UNIXSV)
 EXE_SDL=$(EXE_UNIXSDL)

-EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)

 EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
 EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 
 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
 
 .endif
 

-
-##### Sound configuration #####
-
-.ifndef DP_SOUND_API
-DP_SOUND_API=$(DEFAULT_SNDAPI)
+# jpeg
+.if $(DP_LINK_JPEG) == "shared"
+CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+LIB_JPEG=-ljpeg
+.else
+CFLAGS_LIBJPEG=
+LIB_JPEG=

 .endif
 
 .endif
 

-# NULL: no sound
-.if $(DP_SOUND_API) == "NULL"
-OBJ_SOUND=$(OBJ_SND_NULL)
-LIB_SOUND=$(LIB_SND_NULL)
+# 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
 
 .endif
 

-# OSS: Open Sound System
-.if $(DP_SOUND_API) == "OSS"
-OBJ_SOUND=$(OBJ_SND_OSS)
-LIB_SOUND=$(LIB_SND_OSS)
+# d0_blind_id
+.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
 
 .endif
 

-# BSD: BSD / Sun audio API
-.if $(DP_SOUND_API) == "BSD"
-OBJ_SOUND=$(OBJ_SND_BSD)
-LIB_SOUND=$(LIB_SND_BSD)

 .endif
 
 
 .endif
 
 


@@ -81,26 +126,20 @@ CFLAGS_FS=
 
 CFLAGS_PRELOAD=
 .ifdef DP_PRELOAD_DEPENDENCIES
 
 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
 
 LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
 LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
 CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
 .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

 
 ##### BSD Make specific definitions #####
 
 MAKE:=$(MAKE) -f BSDmakefile
 
 
 ##### BSD Make specific definitions #####
 
 MAKE:=$(MAKE) -f BSDmakefile
 

-DO_LD=$(CC) -o $@ $> $(LDFLAGS)
+DO_LD=$(CC) -o ../../../$@ $> $(LDFLAGS)

 
 
 ##### Definitions shared by all makefiles #####
 
 
 ##### Definitions shared by all makefiles #####