qf
/
quake2forge
mirror of https://git.code.sf.net/p/quake/quake2forge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Put back snd_mixa.S into the build if assembler is 

defined, and adjusted the preprocessor directives in
  snd_mix.c to fit.
This commit is contained in:
Jamie Wilkinson 2002-07-13 02:02:00 +00:00
parent 3848343e89
commit 74c84cbe1f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile.am
View File

@ -30,6 +30,12 @@ else
REF_SOFT_ASM = REF_SOFT_ASM =
endif endif
if ASM_ARCH
QUAKE2_ASM=snd_mixa.S
else
QUAKE2_ASM=
endif
quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
\ \
cl_cin.c cl_ents.c cl_fx.c cl_input.c cl_inv.c \ cl_cin.c cl_ents.c cl_fx.c cl_input.c cl_inv.c \
@ -48,9 +54,10 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
\ \
q_shared.c pmove.c \ q_shared.c pmove.c \
\ \
m_flash.c m_flash.c \
# \ \
# #snd_mixa.S $(QUAKE2_ASM)
quake2_CFLAGS = $(std_cflags) @INCLTDL@ @PTHREAD_CFLAGS@ quake2_CFLAGS = $(std_cflags) @INCLTDL@ @PTHREAD_CFLAGS@
# the macro puts -pthread into cflags, but we want to link # the macro puts -pthread into cflags, but we want to link
# with this flag too, so stick it into the ldflags if it's there... # with this flag too, so stick it into the ldflags if it's there...

8
src/snd_mix.c
View File

@ -78,7 +78,8 @@ LClampDone2:
ret ret
} }
} }
#else #else /* HAVE_MASM */
# ifndef USE_ASM
void S_WriteLinearBlastStereo16 (void) { void S_WriteLinearBlastStereo16 (void) {
int i; int i;
int val; int val;
@ -102,6 +103,7 @@ void S_WriteLinearBlastStereo16 (void) {
snd_out[i+1] = val; snd_out[i+1] = val;
} }
} }
# endif /* !USE_ASM */
#endif /* HAVE_MASM */ #endif /* HAVE_MASM */
void S_TransferStereo16 (unsigned long *pbuf, int endtime) void S_TransferStereo16 (unsigned long *pbuf, int endtime)
@ -429,7 +431,8 @@ LDone:
ret ret
} }
} }
#else #else /* HAVE_MASM */
# ifndef USE_ASM
void S_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int offset) { void S_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int offset) {
int data; int data;
int *lscale, *rscale; int *lscale, *rscale;
@ -459,6 +462,7 @@ void S_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int offset)
ch->pos += count; ch->pos += count;
} }
# endif /* !USE_ASM */
#endif /* HAVE_MASM */ #endif /* HAVE_MASM */
void S_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count, int offset) void S_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count, int offset)