From 3c09f92653f93a4be7c6dd15f39af9e5e223eafb Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 20 Aug 2000 04:18:37 +0000 Subject: [PATCH] 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 --- include/.gitignore | 1 + include/stamp-h | 1 - source/Makefile.am | 7 ++++--- 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 include/stamp-h diff --git a/include/.gitignore b/include/.gitignore index 7ca7c51..3543e1f 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,3 +1,4 @@ Makefile.in Makefile config.h +stamp-h diff --git a/include/stamp-h b/include/stamp-h deleted file mode 100644 index 9788f70..0000000 --- a/include/stamp-h +++ /dev/null @@ -1 +0,0 @@ -timestamp diff --git a/source/Makefile.am b/source/Makefile.am index 9bd2d56..8a3bbec 100644 --- a/source/Makefile.am +++ b/source/Makefile.am @@ -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 \