X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=786d59fd8b852026b1c53726d66b78143e092f3a;hp=43931b1d7ca2e703445edc5be38c857e1c2d3a0d;hb=0256e57e16a302ad45090618b8d6eb5930788809;hpb=7305ab0695a23466c3554c8670c3b8a38bbc54a9

diff --git a/makefile b/makefile
index 43931b1d..786d59fd 100644
--- a/makefile
+++ b/makefile
@@ -1,24 +1,56 @@
 #uncomment one of these according to your sound driver
 #if you use ALSA version 0.9.x
 #SND=snd_alsa_0_9.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
+SOUNDLIB=
 
-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 protocol.o quakeio.o
+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_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 filematch.o collision.o cl_collision.o
 
-OPTIMIZATIONS= -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-#OPTIMIZATIONS= -O -g
+#K6/athlon optimizations
+CPUOPTIMIZATIONS=-march=k6
+#note: don't use -march=athlon, every gcc which has it currently (2.95, 3.0)
+#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
 
-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 -lz
+#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=
 
-#most people can't build the -3dfx version (-3dfx version needs some updates for new mesa)
-all: darkplaces-glx
-#all: darkplaces-glx darkplaces-3dfx
+#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 -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)
+
+#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)
+
+#if you don't need the -3dfx version, use this line
+all: builddate darkplaces-glx
+#all: builddate darkplaces-glx darkplaces-3dfx
+
+builddate:
+	touch builddate.c
 
 .c.o:
 	gcc $(CFLAGS) -c $*.c
@@ -31,7 +63,8 @@ darkplaces-3dfx: $(OBJECTS) in_svgalib.o vid_3dfxsvga.o
 
 
 clean:
-	-rm -f darkplaces-glx darkplaces-3dfx
-	-rm -f vid_glx.o in_svgalib.o vid_3dfxsvga.o $(OBJECTS)
+	-rm -f darkplaces-glx darkplaces-3dfx *.o *.d
+
+.PHONY: clean builddate
 
-.PHONY: clean
+-include *.d