From 9e5f8c3bd992e20556ebd541d5e6cdfdd39cef31 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 31 May 2002 19:24:56 +0000
Subject: [PATCH] win32 compile fixes

---
 configure.ac           |  7 +++++++
 tools/qwaq/Makefile.am | 17 +++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4858662ed..3eae86505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1873,6 +1873,13 @@ AC_SUBST(QFPROGS_LIBS)
 AC_SUBST(QFPROGS_DEPS)
 AC_SUBST(QFPROGS_INCS)
 
+QWAQ_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la'
+QWAQ_LIBS="${QWAQ_DEPS} ${WINMM}"
+QWAQ_INCS=''
+AC_SUBST(QWAQ_LIBS)
+AC_SUBST(QWAQ_DEPS)
+AC_SUBST(QWAQ_INCS)
+
 PAK_DEPS='$(top_builddir)/libs/util/libQFutil.la'
 PAK_LIBS="${PAK_DEPS} ${WINMM}"
 PAK_INCS=""
diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index 485ff534c..2d866f639 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -1,20 +1,21 @@
+QWAQ_LIBS=@QWAQ_LIBS@
+QWAQ_DEPS=@QWAQ_DEPS@
+QWAQ_INCS=@QWAQ_INCS@
+
+INCLUDES=	-I$(top_srcdir)/include $(QWAQ_INCS)
+
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 QCFLAGS=-qq -g -Werror
-INCLUDES= -I$(top_srcdir)/include
 
 noinst_PROGRAMS=qwaq
 noinst_DATA=qwaq.dat
 
-qwaq_libs= \
-	$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
 qwaq_dat_src= \
-	main.qc test.r
+	defs.qc main.qc test.r
 
 qwaq_SOURCES= main.c builtins.c
-qwaq_LDADD= $(qwaq_libs)
-qwaq_DEPENDENCIES= $(qwaq_libs)
+qwaq_LDADD= $(QWAQ_LIBS)
+qwaq_DEPENDENCIES= $(QWAQ_DEPS)
 
 qwaq.dat: progs.src $(qwaq_dat_src) $(top_srcdir)/cs-code/object.r
 	$(QFCC) $(QCFLAGS)