qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-07 08:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix harmless cut&paste error

Browse source
This commit is contained in:
Adam Olsen 2001-04-11 03:22:52 +00:00
parent f36fa31ba2
commit c45a4d2550
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.in
View file

@ -744,6 +744,10 @@ AC_ARG_ENABLE(sound,
[ --disable-sound disable sound outright], [ --disable-sound disable sound outright],
) )
AC_ARG_ENABLE(soundmodules,
[ --enable-soundmodules enable modular sound drivers],
)
SNDTYPE="" SNDTYPE=""
SOUND_LIBS="" SOUND_LIBS=""
SOUND_CFLAGS="" SOUND_CFLAGS=""
@ -864,6 +868,11 @@ QF_maGiC_VALUE
SOUND_LIBS="-lwinmm") SOUND_LIBS="-lwinmm")
fi fi
if test "x$enable_soundmodules" = "xyes"; then
SNDTYPE="modules"
SOUND_LIBS=""
fi
if test "x$enable_sound" = "xno"; then if test "x$enable_sound" = "xno"; then
SNDTYPE="" SNDTYPE=""
SOUND_LIBS="" SOUND_LIBS=""
@ -885,7 +894,8 @@ AM_CONDITIONAL(SNDTYPE_SDL, test "$SNDTYPE" = "SDL")
AM_CONDITIONAL(SNDTYPE_SGI, test "$SNDTYPE" = "SGI") AM_CONDITIONAL(SNDTYPE_SGI, test "$SNDTYPE" = "SGI")
AM_CONDITIONAL(SNDTYPE_SUN, test "$SNDTYPE" = "SUN") AM_CONDITIONAL(SNDTYPE_SUN, test "$SNDTYPE" = "SUN")
AM_CONDITIONAL(SNDTYPE_WIN32, test "$SNDTYPE" = "WIN32") AM_CONDITIONAL(SNDTYPE_WIN32, test "$SNDTYPE" = "WIN32")
AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_9" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SDL" -a "$SNDTYPE" != "SGI" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32") AM_CONDITIONAL(SNDTYPE_MODULES, test "$SNDTYPE" = "MODULES")
AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_9" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SDL" -a "$SNDTYPE" != "SGI" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32" -a "$SNDTYPE" != "MODULES")
dnl Tests for joystick support dnl Tests for joystick support
AC_MSG_CHECKING(for joystick support) AC_MSG_CHECKING(for joystick support)

5
libs/audio/targets/Makefile.am
View file

@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFsound.la lib_LTLIBRARIES = libQFsound.la
libQFsound_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS) libQFsound_la_LDFLAGS = -version-info 1:0:0 $(SOUND_LIBS)
# #
# ... Audio targets # ... Audio targets
@ -36,5 +36,8 @@ endif
if SNDTYPE_NULL if SNDTYPE_NULL
libQFsound_la_SOURCES= snd_common.c snd_null.c libQFsound_la_SOURCES= snd_common.c snd_null.c
endif endif
if SNDTYPE_MODULES
libQFsound_la_SOURCES= snd_common.c snd_modules.c
endif
LIBLIST = libQFsound.la @LIBRARY_SEARCH_PATH@ LIBLIST = libQFsound.la @LIBRARY_SEARCH_PATH@