X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=fff672e45fb2990f6a1881991216f76c63979afc;hp=84cd188ce7d1cf710bea00d45bc4555bc234ee2f;hb=f6ceea1f7d2795192dbadb0407fcfcf0d76a923d;hpb=b639ea6e9aa9de26a840aa95b0b9550e0dcd89b6

diff --git a/makefile b/makefile
index 84cd188c..fff672e4 100644
--- a/makefile
+++ b/makefile
@@ -1,36 +1,78 @@
-#uncomment one of these according to your sound driver
-#if you use ALSA version 0.9.x
-#SND=snd_alsa_0_9.o
-#if you use ALSA version 0.5.x
-#SND=snd_alsa_0_5.o
-#if you use the kernel sound driver or OSS
-SND=snd_oss.o
 
-OBJECTS= buildnumber.o cd_linux.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cl_tent.o cmd.o common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o gl_poly.o gl_rmain.o gl_rmisc.o gl_rsurf.o gl_screen.o gl_warp.o host.o host_cmd.o image.o keys.o mathlib.o menu.o model_alias.o model_brush.o model_shared.o model_sprite.o net_bsd.o net_udp.o net_dgrm.o net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o r_part.o r_explosion.o sbar.o snd_dma.o snd_mem.o snd_mix.o $(SND) sv_main.o sv_move.o sv_phys.o sv_user.o sv_light.o sys_linux.o transform.o view.o wad.o world.o zone.o vid_shared.o palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o r_modules.o r_explosion.o r_lerpanim.o cl_effects.o r_decals.o
 
-OPTIMIZATIONS= -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-#OPTIMIZATIONS= -O -g
+#uncomment these according to your sound driver
 
-CFLAGS= -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS)
-#CFLAGS= -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS)
-#LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl
-LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl -lasound
+#recommended for: anyone not using ALSA 0.5
+SND=snd_oss.o snd_dma.o snd_mix.o snd_mem.o
+SOUNDLIB=
+#recommended for: anyone using ALSA 0.5
+#SND=snd_alsa_0_5.o snd_dma.o snd_mix.o snd_mem.o
+#SOUNDLIB=-lasound
+#recommended for: no one (this driver needs to be updated, it doesn't compile anymore)
+#SND=snd_alsa_0_9.o snd_dma.o snd_mix.o snd_mem.o
+#SOUNDLIB=-lasound
+#recommended for: anyone who can't use the above drivers
+#SND=snd_null.o
+#SOUNDLIB=
 
-all: darkplaces-glx
-#all: darkplaces-glx darkplaces-3dfx
+
+#uncomment your preference
+#if you want CD sound in Linux
+#CD=cd_linux.o
+#if you want no CD audio
+CD=cd_null.o
+
+OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cl_tent.o cmd.o common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o model_alias.o model_brush.o model_shared.o model_sprite.o net_bsd.o net_udp.o net_dgrm.o net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o r_explosion.o sbar.o sv_main.o sv_move.o sv_phys.o sv_user.o sv_light.o sys_linux.o transform.o view.o wad.o world.o zone.o vid_shared.o palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o r_modules.o r_explosion.o r_lerpanim.o protocol.o quakeio.o ui.o portals.o sys_shared.o cl_light.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o dpvsimpledecode.o wavefile.o meshqueue.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=
+
+#use this line for profiling
+PROFILEOPTION=-pg -g
+NOPROFILEOPTIMIZATIONS=
+#use this line for no profiling
+#PROFILEOPTION=
+#NOPROFILEOPTIMIZATIONS=-fomit-frame-pointer
+#use these lines for debugging without profiling
+#PROFILEOPTION=
+#NOPROFILEOPTIMIZATIONS=
+
+#note:
+#the -Werror can be removed to compile even if there are warnings,
+#this is used to ensure that all released versions are free of warnings.
+
+#normal compile
+OPTIMIZATIONS= -O6 -fno-strict-aliasing -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS)
+CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include $(OPTIMIZATIONS) $(PROFILEOPTION)
+#debug compile
+#OPTIMIZATIONS=
+#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
+
+LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXxf86dga -lXxf86vm -ldl $(SOUNDLIB) $(PROFILEOPTION)
+
+all: builddate darkplaces-glx
+
+builddate:
+	touch builddate.c
 
 .c.o:
 	gcc $(CFLAGS) -c $*.c
 
-darkplaces-glx: $(OBJECTS) vid_glx.o
+darkplaces-glx: vid_glx.o $(CD) $(SND) $(OBJECTS)
 	gcc -o $@ $^ $(LDFLAGS)
 
-darkplaces-3dfx: $(OBJECTS) in_svgalib.o vid_3dfxsvga.o
-	gcc -o $@ $^ $(LDFLAGS)
+clean:
+	-rm -f darkplaces-glx *.o *.d
 
+.PHONY: clean builddate
 
-clean:
-	-rm -f darkplaces-glx darkplaces-3dfx
-	-rm -f vid_glx.o in_svgalib.o vid_3dfxsvga.o $(OBJECTS)
+-include *.d
 
-.PHONY: clean