From a086c43694383259fc5dc8be5cb904f547415e63 Mon Sep 17 00:00:00 2001 From: knghtbrd Date: Fri, 7 Jun 2002 20:37:45 +0000 Subject: [PATCH] cd_null.c works now. It's the default because cd_linux.c is Linux only. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1920 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_null.c | 7 +++++-- makefile | 11 +++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cd_null.c b/cd_null.c index d5eeec8a..4d6667d3 100644 --- a/cd_null.c +++ b/cd_null.c @@ -19,7 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -void CDAudio_Play(byte track, qboolean looping) +qboolean cdaudioinitialized = false; + +void CDAudio_Play(qbyte track, qboolean looping) { } @@ -52,4 +54,5 @@ int CDAudio_Init(void) void CDAudio_Shutdown(void) { -} \ No newline at end of file +} + diff --git a/makefile b/makefile index 786d59fd..55b1a77f 100644 --- a/makefile +++ b/makefile @@ -9,11 +9,17 @@ 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 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 +#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) 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 #K6/athlon optimizations CPUOPTIMIZATIONS=-march=k6 -#note: don't use -march=athlon, every gcc which has it currently (2.95, 3.0) +#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 @@ -68,3 +74,4 @@ clean: .PHONY: clean builddate -include *.d + -- 2.39.2