qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-21 19:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Getting ready for 0.2.99beta6...

Browse source
This commit is contained in:
Jeff Teunissen 2001-01-11 10:07:19 +00:00
parent 2e57fd84ef
commit 84ad232ed0
7 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.in
View file

@ -737,6 +737,10 @@ QF_maGiC_VALUE
], JOYTYPE="Linux") ], JOYTYPE="Linux")
fi fi
if test -z "$JOYTYPE" -a "x$ac_cv_header_dinput_h" = "xyes"; then
JOYTYPE="Win32"
fi
if test "$JOYTYPE"; then if test "$JOYTYPE"; then
AC_MSG_RESULT([yes ($JOYTYPE)]) AC_MSG_RESULT([yes ($JOYTYPE)])
else else
@ -745,7 +749,8 @@ fi
AC_SUBST(JOY_LIBS) AC_SUBST(JOY_LIBS)
AC_SUBST(JOY_CFLAGS) AC_SUBST(JOY_CFLAGS)
AM_CONDITIONAL(JOYTYPE_LINUX, test "$JOYTYPE" = "Linux") AM_CONDITIONAL(JOYTYPE_LINUX, test "$JOYTYPE" = "Linux")
AM_CONDITIONAL(JOYTYPE_NULL, test "$JOYTYPE" != "Linux") AM_CONDITIONAL(JOYTYPE_WIN32, test "$JOYTYPE" = "Win32")
AM_CONDITIONAL(JOYTYPE_NULL, test "$JOYTYPE" != "Linux" -a "$JOYTYPE" != "Win32")
dnl ================================================================== dnl ==================================================================
dnl Checks for CD-ROM dnl Checks for CD-ROM

2
debian/Makefile.am vendored
View file

@ -1,4 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
EXTRA_DIST= changelog control copyright rules \ EXTRA_DIST= changelog control copyright rules \
quakeforge.conf \ quakeforge.conf \
qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \ qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \

1
doc/Makefile.am
View file

@ -1,4 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
SUBDIRS = man texinfo SUBDIRS = man texinfo
EXTRA_DIST = readme.txt template.h EXTRA_DIST = readme.txt template.h

1
doc/man/Makefile.am
View file

@ -1,4 +1,5 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
man_MANS = quakeforge.1 man_MANS = quakeforge.1
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)

2
doc/texinfo/Makefile.am
View file

@ -1,4 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
info_TEXINFOS = quakeforge.texinfo info_TEXINFOS = quakeforge.texinfo
EXTRA_DIST = gpl.texinfo EXTRA_DIST = gpl.texinfo

2
include/Makefile.am
View file

@ -1,4 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS= foreign
EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_i386.h block16.h \ EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_i386.h block16.h \
block8.h bothdefs.h bspfile.h buildnum.h cdaudio.h checksum.h \ block8.h bothdefs.h bspfile.h buildnum.h cdaudio.h checksum.h \
cl_cam.h cl_demo.h cl_ents.h cl_input.h cl_main.h cl_parse.h \ cl_cam.h cl_demo.h cl_ents.h cl_input.h cl_main.h cl_parse.h \

4
source/Makefile.am
View file

@ -26,6 +26,7 @@
# #
# $Id$ # $Id$
# #
AUTOMAKE_OPTIONS= foreign
# #
# Stuff that is common to both client and server # Stuff that is common to both client and server
@ -149,6 +150,9 @@ EXTRA_libqfcd_a_SOURCES= cd_dos.c cd_linux.c cd_sdl.c cd_sgi.c cd_win.c cd_null.
if JOYTYPE_LINUX if JOYTYPE_LINUX
libqfjs_a_SOURCES= joy_linux.c libqfjs_a_SOURCES= joy_linux.c
endif endif
if JOYTYPE_WIN32
libqfjs_a_SOURCES= joy_win.c
endif
if JOYTYPE_NULL if JOYTYPE_NULL
libqfjs_a_SOURCES= joy_null.c libqfjs_a_SOURCES= joy_null.c
endif endif