get qw-server to link in mingw

libs/util/Makefile.am

@@ -5,6 +5,6 @@ libQFutil_la_SOURCES = \
 	checksum.c cmd.c console.c crc.c cvar.c hash.c info.c link.c math.S \
 	mathlib.c \
 	mdfour.c msg.c qargs.c qendian.c qfplist.c quakefs.c quakeio.c \
-	sizebuf.c sys.c va.c ver_check.c zone.c
+	sizebuf.c sys.c sys_error.c va.c ver_check.c zone.c
 
 LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@

libs/util/sys.c

@@ -121,21 +121,6 @@ Sys_mkdir (const char *path)
 		Sys_Error ("mkdir %s: %s", path, strerror (errno));
 }
 
-void
-QFutil_Sys_Error (const char *error, ...)
-{
-	va_list     argptr;
-	char        string[1024];
-
-	va_start (argptr, error);
-	vsnprintf (string, sizeof (string), error, argptr);
-	fprintf (stderr, "Error: %s\n", string);
-
-	exit (1);
-}
-
-void Sys_Error (const char *error, ...) __attribute ((weak, alias ("QFutil_Sys_Error")));
-
 int
 Sys_FileTime (const char *path)
 {

libs/util/sys_error.c

@@ -0,0 +1,50 @@
+/*
+	sys.c
+
+	virtual filesystem functions
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "QF/compat.h"
+#include "QF/sys.h"
+
+void
+QFutil_Sys_Error (const char *error, ...)
+{
+	va_list     argptr;
+	char        string[1024];
+
+	va_start (argptr, error);
+	vsnprintf (string, sizeof (string), error, argptr);
+	fprintf (stderr, "Error: %s\n", string);
+
+	exit (1);
+}
+
+void Sys_Error (const char *error, ...) __attribute ((weak, alias ("QFutil_Sys_Error")));

qw/source/Makefile.am

@@ -40,7 +40,8 @@ EXTRA_PROGRAMS= qw-client-3dfx qw-client-fbdev \
 		qw-client-sgl qw-client-svga qw-client-wgl \
 		qw-client-x11 qw-server
 
-noinst_LIBRARIES= libqfjs.a libqfnet.a libqfsys_cl.a libqfsys_sv.a
+noinst_LIBRARIES= libqfjs.a libqfnet.a
+#libqfsys_cl.a libqfsys_sv.a
 
 if PACKETLOG
 packetlogger = net_packetlog.c
@@ -70,11 +71,10 @@ EXTRA_libqfnet_a_SOURCES= net_chan.c net_udp.c net_udp6.c
 # ... System type
 #
 if SYSTYPE_WIN32
-libqfsys_sv_a_SOURCES=	fnmatch.c dirent.c sv_sys_win.c sys_win.c
+syssv_SRC=	fnmatch.c dirent.c sv_sys_win.c
 else
-libqfsys_sv_a_SOURCES=	sv_sys_unix.c
+syssv_SRC=	sv_sys_unix.c
 endif
-EXTRA_libqfsys_sv_a_SOURCES= fnmatch.c dirent.c sv_sys_unix.c sv_sys_win.c
 
 if ASM_ARCH
 world_ASM=	worlda.S
@@ -83,13 +83,13 @@ endif
 server_SOURCES=	sv_ccmds.c sv_cvar.c \
 		sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \
 		sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
-		sv_user.c world.c $(world_ASM)
+		sv_user.c world.c $(world_ASM) $(syssv_SRC)
 
 qw_server_SOURCES=	$(common_SOURCES) $(server_SOURCES)
 qw_server_LDADD= 	$(top_builddir)/libs/util/libQFutil.la \
 			$(top_builddir)/libs/gamecode/libQFgamecode.la \
-			-L. -lqfnet -lqfsys_sv $(NET_LIBS) $(DL_LIBS)
+			-L. -lqfnet $(NET_LIBS) $(DL_LIBS)
-qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a
+qw_server_DEPENDENCIES= libqfnet.a
 
 #
 # Client builds
@@ -97,11 +97,10 @@ qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a
 # ... System type
 #
 if SYSTYPE_WIN32
-libqfsys_cl_a_SOURCES=	cl_sys_win.c fnmatch.c dirent.c sys_win.c
+syscl_SRC=	cl_sys_win.c fnmatch.c dirent.c
 else
-libqfsys_cl_a_SOURCES=	cl_sys_unix.c
+syscl_SRC=	cl_sys_unix.c
 endif
-EXTRA_libqfsys_cl_a_SOURCES= cl_sys_sdl.c cl_sys_unix.c cl_sys_win.c sys_win.c fnmatch.c dirent.c
 
 #
 # ... Joystick
@@ -122,9 +121,9 @@ CLIENT_LIBS=		$(top_builddir)/libs/util/libQFutil.la \
 			$(top_builddir)/libs/gamecode/libQFgamecode.la \
 			$(top_builddir)/libs/audio/cd/libQFcd.la \
 			$(top_builddir)/libs/audio/targets/libQFsound.la \
-			-L. -lqfnet -lqfsys_cl -lqfjs \
+			-L. -lqfnet -lqfjs \
 			$(SOUND_LIBS) $(NET_LIBS) $(JOY_LIBS)
-CLIENT_LIB_DEPS=	libqfnet.a libqfsys_cl.a libqfjs.a
+CLIENT_LIB_DEPS=	libqfnet.a libqfjs.a
 
 if ASM_ARCH
 client_ASM=	cl_math.S
@@ -133,7 +132,7 @@ endif
 client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
 	cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
 	console.c keys.c locs.c model_alias.c model_sprite.c nonintel.c \
-	pcx.c r_efrag.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM)
+	pcx.c r_efrag.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c vid.c $(client_ASM) $(syscl_SRC)
 
 #
 # Software-rendering clients