From 60107fd19cfe286dcc973db4da9b396eabb25b38 Mon Sep 17 00:00:00 2001 From: Chris Ison Date: Sat, 29 Sep 2001 09:39:27 +0000 Subject: [PATCH] changes to get cygwin to compile server. still debugging result --- configure.ac | 20 +++++++++++++++++++- libs/util/quakefs.c | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 801626513..17785c80c 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,20 @@ case "$host_os" in endian="little" fi ;; + cygwin*) + cygwin=yes + CPPFLAGS="$CPPFLAGS -mno-cygwin" + CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32" + CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources" + if test $host != $build; then + CC=$host_cpu-$host_os-gcc + AS=$host_cpu-$host_os-gcc + AR=$host_cpu_$host_os-ar + RANLIB=$host_cpu-$host_os-ranlib + endian="little" + fi + LDFLAGS="$LDFLAGS -mno-cygwin" + ;; esac dnl ================================================================== @@ -541,6 +555,10 @@ case "${host}" in SYSTYPE=WIN32 AC_MSG_RESULT([Win32 driver]) ;; + i?86-*-cygwin*) + SYSTYPE=WIN32 + AC_MSG_RESULT([Win32 driver]) + ;; *) SYSTYPE=POSIX AC_MSG_RESULT([default POSIX driver]) @@ -1150,7 +1168,7 @@ if test "x$GCC" = "xyes"; then fi AS="$CC" -ASFLAGS="$CFLAGS" +ASFLAGS="\$(DEFS) $CFLAGS $CPPFLAGS -I\$(top_srcdir)/include" AC_SUBST(AS) AC_SUBST(ASFLAGS) diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c index acda22973..815800294 100644 --- a/libs/util/quakefs.c +++ b/libs/util/quakefs.c @@ -50,6 +50,10 @@ static const char rcsid[] = # define model_t sunmodel_t # include # undef model_t +#else +# ifdef WIN32 +# include "fnmatch.h" +# endif #endif #ifdef WIN32