mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
Getting ready for 0.2.99beta6...
This commit is contained in:
parent
2e57fd84ef
commit
84ad232ed0
7 changed files with 18 additions and 1 deletions
|
@ -737,6 +737,10 @@ QF_maGiC_VALUE
|
|||
], JOYTYPE="Linux")
|
||||
fi
|
||||
|
||||
if test -z "$JOYTYPE" -a "x$ac_cv_header_dinput_h" = "xyes"; then
|
||||
JOYTYPE="Win32"
|
||||
fi
|
||||
|
||||
if test "$JOYTYPE"; then
|
||||
AC_MSG_RESULT([yes ($JOYTYPE)])
|
||||
else
|
||||
|
@ -745,7 +749,8 @@ fi
|
|||
AC_SUBST(JOY_LIBS)
|
||||
AC_SUBST(JOY_CFLAGS)
|
||||
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 Checks for CD-ROM
|
||||
|
|
2
debian/Makefile.am
vendored
2
debian/Makefile.am
vendored
|
@ -1,4 +1,6 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
EXTRA_DIST= changelog control copyright rules \
|
||||
quakeforge.conf \
|
||||
qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
SUBDIRS = man texinfo
|
||||
|
||||
EXTRA_DIST = readme.txt template.h
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
man_MANS = quakeforge.1
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
info_TEXINFOS = quakeforge.texinfo
|
||||
|
||||
EXTRA_DIST = gpl.texinfo
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
## 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 \
|
||||
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 \
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#
|
||||
# $Id$
|
||||
#
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
#
|
||||
# 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
|
||||
libqfjs_a_SOURCES= joy_linux.c
|
||||
endif
|
||||
if JOYTYPE_WIN32
|
||||
libqfjs_a_SOURCES= joy_win.c
|
||||
endif
|
||||
if JOYTYPE_NULL
|
||||
libqfjs_a_SOURCES= joy_null.c
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue