win32 compile fixes

This commit is contained in:
Bill Currie 2002-05-31 19:24:56 +00:00
parent 55fcead77c
commit 9e5f8c3bd9
2 changed files with 16 additions and 8 deletions

View file

@ -1873,6 +1873,13 @@ AC_SUBST(QFPROGS_LIBS)
AC_SUBST(QFPROGS_DEPS) AC_SUBST(QFPROGS_DEPS)
AC_SUBST(QFPROGS_INCS) 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_DEPS='$(top_builddir)/libs/util/libQFutil.la'
PAK_LIBS="${PAK_DEPS} ${WINMM}" PAK_LIBS="${PAK_DEPS} ${WINMM}"
PAK_INCS="" PAK_INCS=""

View file

@ -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 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
QCFLAGS=-qq -g -Werror QCFLAGS=-qq -g -Werror
INCLUDES= -I$(top_srcdir)/include
noinst_PROGRAMS=qwaq noinst_PROGRAMS=qwaq
noinst_DATA=qwaq.dat noinst_DATA=qwaq.dat
qwaq_libs= \
$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la
qwaq_dat_src= \ qwaq_dat_src= \
main.qc test.r defs.qc main.qc test.r
qwaq_SOURCES= main.c builtins.c qwaq_SOURCES= main.c builtins.c
qwaq_LDADD= $(qwaq_libs) qwaq_LDADD= $(QWAQ_LIBS)
qwaq_DEPENDENCIES= $(qwaq_libs) qwaq_DEPENDENCIES= $(QWAQ_DEPS)
qwaq.dat: progs.src $(qwaq_dat_src) $(top_srcdir)/cs-code/object.r qwaq.dat: progs.src $(qwaq_dat_src) $(top_srcdir)/cs-code/object.r
$(QFCC) $(QCFLAGS) $(QFCC) $(QCFLAGS)