shiver me timbers, uquake-x11 works!!!!!!

include/.gitignore:
	ignore stamp-h
include/stamp-h:
	shouldn't be in cvs
source/Makefile.am:
	comment out the `if ASM_ARCH' and corresponding endif as there seems
	to be either a bug or a misunderstanding in automake snd_mixa.o is
	now built
This commit is contained in:
Bill Currie 2000-08-20 04:18:37 +00:00
parent 111c1b0d4c
commit 3c09f92653
3 changed files with 5 additions and 4 deletions

1
include/.gitignore vendored
View file

@ -1,3 +1,4 @@
Makefile.in
Makefile
config.h
stamp-h

View file

@ -1 +0,0 @@
timestamp

View file

@ -39,14 +39,14 @@ EXTRA_PROGRAMS= uquake-ggi uquake-mgl uquake-sdl uquake-svga uquake-x11 \
noinst_LIBRARIES= libqfsys.a libqfsnd.a libqfcd.a libqfnet.a
if ASM_ARCH
#if ASM_ARCH
math_ASM= math.S cl_math.S
soft_ASM= d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \
d_varsa.S r_aclipa.S r_aliasa.S r_drawa.S r_edgea.S r_varsa.S \
surf16.s surf8.s
sound_ASM= snd_mixa.S
common_ASM= sys_ia32.S worlda.S $(math_ASM)
endif
#endif
common_SOURCES= crc.c common.c cvar.c cmd.c mathlib.c wad.c world.c \
zone.c $(common_ASM)
@ -111,7 +111,8 @@ EXTRA_libqfcd_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \
client_LIBS= -L. -lqfsys -lqfsnd -lqfcd -lqfnet $(SOUND_LIBS) $(NET_LIBS)
client_SOURCES= cl_cam.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
cl_tent.c console.c keys.c menu.c sbar.c view.c
cl_tent.c console.c keys.c menu.c sbar.c view.c \
nonintel.c
server_SOURCES= host.c host_cmd.c \
pr_cmds.c pr_edict.c pr_exec.c \