From 2b12a1b8d88dae539baaec0752e38cb491f3b6a5 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Sun, 3 Feb 2002 10:34:02 +0000 Subject: [PATCH] changed back to profiling, with optimizations, and back to alsa 0.5 sound git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1483 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index f53d0445..48743bc2 100644 --- a/makefile +++ b/makefile @@ -3,11 +3,11 @@ #SND=snd_alsa_0_9.o #SOUNDLIB=-lasound #if you use ALSA version 0.5.x -#SND=snd_alsa_0_5.o -#SOUNDLIB=-lasound +SND=snd_alsa_0_5.o +SOUNDLIB=-lasound #if you use the kernel sound driver or OSS -SND=snd_oss.o -SOUNDLIB= +#SND=snd_oss.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 gl_screen.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 r_decals.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_decals.o cl_screen.o cgamevm.o cgame.o @@ -17,25 +17,25 @@ CPUOPTIMIZATIONS=-march=k6 #CPUOPTIMIZATIONS=-march=i686 #use this line for profiling -#PROFILEOPTION=-pg -g -#NOPROFILEOPTIMIZATIONS= +PROFILEOPTION=-pg -g +NOPROFILEOPTIMIZATIONS= #use this line for no profiling #PROFILEOPTION= #NOPROFILEOPTIMIZATIONS=-fomit-frame-pointer #use these lines for debugging without profiling -PROFILEOPTION= -NOPROFILEOPTIMIZATIONS= +#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 -ffast-math -funroll-loops $(NOPROFILEOPTIMIZATIONS) -fexpensive-optimizations $(CPUOPTIMIZATIONS) -#CFLAGS= -MD -Wall -Werror -I/usr/X11R6/include -I/usr/include/glide $(OPTIMIZATIONS) $(PROFILEOPTION) +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) +#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) -- 2.39.2