X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=2aacb9a64a495d1d986e77a9ea8e381a09a3263d;hp=8cfd6929a5a4ac664433722e0c3c086ff7663a10;hb=b2f7fe6f3ec6934b89161592c5df77b3932f2698;hpb=c2995f2c4c030b1c3adb163fd84b4ea5b3d2b104

diff --git a/makefile b/makefile
index 8cfd6929..2aacb9a6 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,35 @@
-#uncomment one of these according to your sound driver
-#if you use ALSA version 0.9.x
-#SND=snd_alsa_0_9.o
+
+
+#uncomment these according to your sound driver
+
+#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
-#if you use ALSA version 0.5.x
-SND=snd_alsa_0_5.o
-SOUNDLIB=-lasound
-#if you use the kernel sound driver or OSS
-#SND=snd_oss.o
+#recommended for: anyone who can't use the above drivers
+#SND=snd_null.o
 #SOUNDLIB=
 
-OBJECTS= builddate.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 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_particles.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 protocol.o quakeio.o r_clip.o ui.o portals.o sys_shared.o cl_light.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o cgame.o
+
+#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 $(CD) $(SND) 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 r_clip.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
 
@@ -31,13 +48,16 @@ NOPROFILEOPTIMIZATIONS=
 #this is used to ensure that all released versions are free of warnings.
 
 #normal compile
-OPTIMIZATIONS= -O6 -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS)
-CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS) $(PROFILEOPTION)
+#OPTIMIZATIONS= -O6 -fno-strict-aliasing -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS)
+#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS) $(PROFILEOPTION)
 #debug compile
-#OPTIMIZATIONS=
-#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
+OPTIMIZATIONS=
+CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -ggdb $(OPTIMIZATIONS) $(PROFILEOPTION)
 
-LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl $(SOUNDLIB) $(PROFILEOPTION)
+#LordHavoc: what is XIE?  XFree 4.1.0 doesn't need it and 4.2.0 seems to be missing it entirely
+#LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl $(SOUNDLIB) $(PROFILEOPTION)
+#LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXxf86dga -lXxf86vm -lGL -ldl $(SOUNDLIB) $(PROFILEOPTION)
+LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXxf86dga -lXxf86vm -ldl $(SOUNDLIB) $(PROFILEOPTION)
 
 #if you don't need the -3dfx version, use this line
 all: builddate darkplaces-glx
@@ -57,8 +77,9 @@ darkplaces-3dfx: $(OBJECTS) in_svgalib.o vid_3dfxsvga.o
 
 
 clean:
-	-rm -f darkplaces-glx darkplaces-3dfx vid_glx.o in_svgalib.o vid_3dfxsvga.o $(OBJECTS) *.d
+	-rm -f darkplaces-glx darkplaces-3dfx *.o *.d
 
 .PHONY: clean builddate
 
 -include *.d
+