X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.bsd;h=af0228e83a1edc070a95b123c77209694928e9a7;hp=95bf677ad2af4f918fad0ff8e14eedb7caa018c8;hb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b;hpb=e526d9653bdf0d6783d4383ec0c3528fd4a487b2

diff --git a/makefile.bsd b/makefile.bsd
index 95bf677a..af0228e8 100644
--- a/makefile.bsd
+++ b/makefile.bsd
@@ -1,178 +1,75 @@
-##### Variables that you may want to modify #####
+#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
 
-#choose the compiler you want to use
-CC=gcc
+.ifndef DP_MAKE_TARGET
 
-MAKE:=$(MAKE) -f makefile.bsd
+DP_MAKE_TARGET=bsd
+
+.endif
+DP_ARCH != uname
+
+
+# Command used to delete files
+CMD_RM=$(CMD_UNIXRM)
+
+UNIX_X11LIBPATH=-L/usr/X11R6/lib
+
+# BSD configuration
+.if $(DP_MAKE_TARGET) == "bsd"
+
+# FreeBSD uses OSS
+.if $(DP_ARCH) == "FreeBSD"
+DEFAULT_SNDAPI=OSS
+.else
+DEFAULT_SNDAPI=BSD
+.endif
+OBJ_CD=$(OBJ_BSDCD)
+
+OBJ_CL=$(OBJ_GLX)
+
+LDFLAGS_CL=$(LDFLAGS_BSDCL)
+LDFLAGS_SV=$(LDFLAGS_BSDSV)
+
+EXE_CL=$(EXE_UNIXCL)
+EXE_SV=$(EXE_UNIXSV)
+EXE_SDL=$(EXE_UNIXSDL)
 
-#recommended for: anyone not using ALSA 0.5
-#OBJ_BSDSOUND=snd_oss.o snd_dma.o snd_mix.o snd_mem.o
-OBJ_BSDSOUND=snd_null.o
-BSDSOUNDLIB=
-
-#if you want CD sound in Linux
-#OBJ_BSDCD=cd_bsd.o
-#if you want no CD audio
-OBJ_BSDCD=cd_null.o
-
-#K6/athlon optimizations
-#CPUOPTIMIZATIONS=-march=k6
-#note: don't use -march=athlon, every gcc which has it currently (2.96-3.1)
-#have optimizer bugs (like entities disappearing randomly - a bug with
-#compiling BOX_ON_PLANE_SIDE in mathlib.h)
-#CPUOPTIMIZATIONS=-march=athlon
-#686 optimizations
-#CPUOPTIMIZATIONS=-march=i686
-#no specific CPU
-CPUOPTIMIZATIONS=
-
-
-##### Variables that you shouldn't care about #####
-
-CMD_RM=rm -f
-
-# Objects
-CLIENTOBJECTS=	cgame.o cgamevm.o cl_collision.o cl_demo.o cl_input.o \
-		cl_main.o cl_parse.o cl_particles.o cl_screen.o cl_video.o \
-		console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \
-		gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \
-		jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
-		r_lerpanim.o r_light.o r_lightning.o r_modules.o r_sky.o \
-		r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
-                r_shadow.o prvm_exec.o prvm_edict.o prvm_cmds.o
-SERVEROBJECTS=	pr_cmds.o pr_edict.o pr_exec.o sv_main.o sv_move.o \
-		sv_phys.o sv_user.o
-SHAREDOBJECTS=	cmd.o collision.o common.o crc.o cvar.o \
-		filematch.o host.o host_cmd.o image.o mathlib.o matrixlib.o \
-		model_alias.o model_brush.o model_shared.o model_sprite.o \
-		netconn.o lhnet.o palette.o portals.o protocol.o fs.o \
-		sys_shared.o winding.o world.o wad.o zone.o curves.o
-COMMONOBJECTS= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS)
-
-# note that builddate.c is very intentionally not compiled to a .o before
-# being linked, because it should be recompiled every time an executable is
-# built to give the executable a proper date string
-OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_BSDCD) $(OBJ_BSDSOUND) $(COMMONOBJECTS)
-OBJ_DED= builddate.c sys_linux.o vid_null.o cd_null.o snd_null.o $(COMMONOBJECTS)
-
-
-# Compilation
-# CFLAGS_NONEXECOMMON=-MD -Wall -Werror
-CFLAGS_NONEXECOMMON=-MD -Wall
-CFLAGS_DEBUG=-ggdb
-CFLAGS_PROFILE=-g -pg -ggdb
-CFLAGS_RELEASE=
-
-OPTIM_DEBUG=
-OPTIM_RELEASE=	-O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
-
-DO_CC=$(CC) $(CFLAGS) -c $< -o $@
-
-
-# Link
-# LordHavoc note: I have been informed that system libraries must come last
-# on the linker line, and that -lm must always be last
-LDFLAGS_GLX=-lm
-LDFLAGS_DED=-lm
-LDFLAGS_DEBUG=-g -ggdb
-LDFLAGS_PROFILE=-g -pg
-LDFLAGS_RELEASE=
-
-EXE_GLX=darkplaces-glx
-EXE_DED=darkplaces-dedicated
+.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)
+.endif
+
+# BSD: BSD / Sun audio API
+.if $(DP_SOUND_API) == "BSD"
+OBJ_SOUND=$(OBJ_SND_BSD)
+LIB_SOUND=$(LIB_SND_BSD)
+.endif
+
+
+##### BSD Make specific definitions #####
+
+MAKE:=$(MAKE) -f makefile.bsd
 
 DO_LD=$(CC) -o $@ $> $(LDFLAGS)
 
 
-##### Commands #####
-
-.PHONY : clean help \
-	 debug profile release \
-	 glx-debug glx-profile glx-release \
-	 ded-debug ded-profile ded-release
-
-help:
-	@echo
-	@echo "===== Choose one ====="
-	@echo "* $(MAKE) clean          : delete the binaries, and .o and .d files"
-	@echo "* $(MAKE) help           : this help"
-	@echo "* $(MAKE) debug          : make GLX and dedicated binaries (debug versions)"
-	@echo "* $(MAKE) profile        : make GLX and dedicated binaries (profile versions)"
-	@echo "* $(MAKE) release        : make GLX and dedicated binaries (release versions)"
-	@echo "* $(MAKE) glx-debug      : make GLX client (debug version)"
-	@echo "* $(MAKE) glx-profile    : make GLX client (profile version)"
-	@echo "* $(MAKE) glx-release    : make GLX client (release version)"
-	@echo "* $(MAKE) ded-debug      : make dedicated server (debug version)"
-	@echo "* $(MAKE) ded-profile    : make dedicated server (profile version)"
-	@echo "* $(MAKE) ded-release    : make dedicated server (release version)"
-	@echo
-
-debug :
-	$(MAKE) glx-debug ded-debug
-
-profile :
-	$(MAKE) glx-profile ded-profile
-
-release :
-	$(MAKE) glx-release ded-release
-
-glx-debug :
-	$(MAKE) bin-debug EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-glx-profile :
-	$(MAKE) bin-profile EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-glx-release :
-	$(MAKE) bin-release EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-ded-debug :
-	$(MAKE) bin-debug EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-ded-profile :
-	$(MAKE) bin-profile EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-ded-release :
-	$(MAKE) bin-release EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
-
-bin-debug :
-	@echo
-	@echo "========== $(EXE) (debug) =========="
-	$(MAKE) $(EXE) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
-		LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
-
-bin-profile :
-	@echo
-	@echo "========== $(EXE) (profile) =========="
-	$(MAKE) $(EXE) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
-		LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
-
-bin-release :
-	@echo
-	@echo "========== $(EXE) (release) =========="
-	$(MAKE) $(EXE) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
-		LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
-	strip $(EXE)
-
-vid_glx.o: vid_glx.c
-	$(DO_CC) -I/usr/X11R6/include
-
-.c.o:
-	$(DO_CC)
-
-$(EXE_GLX):  $(OBJ_GLX)
-	$(DO_LD) -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LINUXSOUNDLIB)
-
-$(EXE_DED): $(OBJ_DED)
-	$(DO_LD)
-
-clean:
-	-$(CMD_RM) $(EXE_GLX)
-	-$(CMD_RM) $(EXE_DED)
-	-$(CMD_RM) *.o
-	-$(CMD_RM) *.d
+##### Definitions shared by all makefiles #####
+.include "makefile.inc"
 
 
 ##### Dependency files #####