qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

alsa detection improvement sfor latest 0.9, add the qw master package, and

Browse source 
get the server packages building
This commit is contained in:
Bill Currie 2001-09-24 23:18:05 +00:00
parent 969961628d
commit 8b15be4ced
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
RPM/quakeforge.spec.in
View file

@ -60,6 +60,16 @@ Software's very popular DOOM series. Its primary development goal is to
remain compatible with the original games released by id Software while
adding portability and optional extensions to enhance gameplay.
%package master
Summary: QuakeForge 3D game engine - Master Server
Group: Amusements/Games
#Requires:
%description master
QuakeForge is a source port of Quake and QuakeWorld, the successors to id
Software's very popular DOOM series. Its primary development goal is to
remain compatible with the original games released by id Software while
adding portability and optional extensions to enhance gameplay.
%if "%{HAVE_3DFX}"=="'yes'"
%package 3dfx
Summary: QuakeForge 3D game engine - 3dfx client
@ -300,11 +310,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_render_default.so.1
%attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_render_default.so.1.0.0
%if "%{HAVE_SERVER}"=="'yes'"
%files server
%attr(-,root,root) %{_prefix}/bin/qw-server
#%attr(-,root,root) %{_prefix}/bin/nq-server
%endif
%files master
%attr(-,root,root) %{_prefix}/bin/qw-master
%if "%{HAVE_3DFX}"=="'yes'"
%files 3dfx

37
configure.ac
View file

@ -92,6 +92,7 @@ AC_HEADER_STDC
AC_HEADER_MAJOR
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(
alsa/asoundlib.h \
arpa/inet.h asm/io.h assert.h conio.h ctype.h ddraw.h dinput.h \
direct.h dirent.h dlfcn.h dmedia/audio.h dmedia/cdaudio.h dpmi.h \
dsound.h errno.h execinfo.h fcntl.h fnmatch.h glide/sst1vid.h io.h \
@ -607,34 +608,36 @@ SOUND_TYPES=
AC_MSG_CHECKING(for sound support)
HAVE_ALSA=no
if test "x$enable_alsa" != "xno" -a \
"x$ac_cv_header_sys_asoundlib_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
if test "x$enable_alsa" != "xno"; then
if test "x$ac_cv_header_sys_asoundlib_h" = "xyes" -o \
"x$ac_cv_header_alsa_asoundlib_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <sys/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 5)
QF_maGiC_VALUE
#endif
#endif
],
SOUND_TYPES="$SOUND_TYPES ALSA0.5"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes,
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <sys/asoundlib.h>
],
SOUND_TYPES="$SOUND_TYPES ALSA0.5"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes,
AC_EGREP_CPP([QF_maGiC_VALUE],
[
#include <alsa/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
#if SND_LIB_MAJOR > 0 || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR >= 9)
QF_maGiC_VALUE
#endif
#endif
],
SOUND_TYPES="$SOUND_TYPES ALSA0.9"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes
)
)
],
SOUND_TYPES="$SOUND_TYPES ALSA0.9"
ALSA_LIBS="-lasound"
HAVE_ALSA=yes
)
)
fi
fi
AC_SUBST(ALSA_LIBS)
AC_SUBST(HAVE_ALSA)