qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

win32 compile fixes

Browse source
This commit is contained in:
Bill Currie 2002-06-04 16:17:10 +00:00
parent 77d244220b
commit 0f9adc182d
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -686,17 +686,21 @@ case "${host}" in
i?86-*-mingw32*) i?86-*-mingw32*)
SYSTYPE=WIN32 SYSTYPE=WIN32
AC_MSG_RESULT([Win32 driver]) AC_MSG_RESULT([Win32 driver])
WIN32_LIBS=' $(NET_LIBS)'
;; ;;
i?86-*-cygwin*) i?86-*-cygwin*)
SYSTYPE=WIN32 SYSTYPE=WIN32
AC_MSG_RESULT([Win32 driver]) AC_MSG_RESULT([Win32 driver])
WIN32_LIBS=' $(NET_LIBS)'
;; ;;
*) *)
SYSTYPE=POSIX SYSTYPE=POSIX
AC_MSG_RESULT([default POSIX driver]) AC_MSG_RESULT([default POSIX driver])
WIN32_LIBS=''
;; ;;
esac esac
AM_CONDITIONAL(SYSTYPE_WIN32, test "$SYSTYPE" = "WIN32") AM_CONDITIONAL(SYSTYPE_WIN32, test "$SYSTYPE" = "WIN32")
AC_SUBST(WIN32_LIBS)
dnl Check for ia32 dnl Check for ia32
AC_MSG_CHECKING(for an ia32 machine) AC_MSG_CHECKING(for an ia32 machine)
@ -1859,28 +1863,28 @@ AC_SUBST(plugin_ldflags)
AC_SUBST(plugin_libadd) AC_SUBST(plugin_libadd)
QFCC_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la' QFCC_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la'
QFCC_LIBS="${QFCC_DEPS} ${WINMM}" QFCC_LIBS="${QFCC_DEPS} "'$(WIN32_LIBS)'
QFCC_INCS='-I$(top_srcdir)/tools/qfcc/include' QFCC_INCS='-I$(top_srcdir)/tools/qfcc/include'
AC_SUBST(QFCC_LIBS) AC_SUBST(QFCC_LIBS)
AC_SUBST(QFCC_DEPS) AC_SUBST(QFCC_DEPS)
AC_SUBST(QFCC_INCS) AC_SUBST(QFCC_INCS)
QFPROGS_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la' QFPROGS_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la'
QFPROGS_LIBS="${QFPROGS_DEPS} ${WINMM}" QFPROGS_LIBS="${QFPROGS_DEPS} "'$(WIN32_LIBS)'
QFPROGS_INCS='-I$(top_srcdir)/tools/qfprogs/include' QFPROGS_INCS='-I$(top_srcdir)/tools/qfprogs/include'
AC_SUBST(QFPROGS_LIBS) 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_DEPS='$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la'
QWAQ_LIBS="${QWAQ_DEPS} ${WINMM}" QWAQ_LIBS="${QWAQ_DEPS} "'$(WIN32_LIBS)'
QWAQ_INCS='' QWAQ_INCS=''
AC_SUBST(QWAQ_LIBS) AC_SUBST(QWAQ_LIBS)
AC_SUBST(QWAQ_DEPS) AC_SUBST(QWAQ_DEPS)
AC_SUBST(QWAQ_INCS) 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} "'$(WIN32_LIBS)'
PAK_INCS="" PAK_INCS=""
AC_SUBST(PAK_LIBS) AC_SUBST(PAK_LIBS)
AC_SUBST(PAK_DEPS) AC_SUBST(PAK_DEPS)

6
libs/util/sys.c
View file

@ -41,6 +41,9 @@ static const char rcsid[] =
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
# include <limits.h> # include <limits.h>
#endif #endif
#ifdef HAVE_CONIO_H
# include <conio.h>
#endif
#ifdef HAVE_IO_H #ifdef HAVE_IO_H
# include <io.h> # include <io.h>
#endif #endif
@ -471,6 +474,7 @@ Sys_CheckInput (int idle, int net_socket)
struct timeval *timeout = 0; struct timeval *timeout = 0;
#ifdef _WIN32 #ifdef _WIN32
int sleep_msec;
// Now we want to give some processing time to other applications, // Now we want to give some processing time to other applications,
// such as qw_client, running on this machine. // such as qw_client, running on this machine.
sleep_msec = sys_sleep->int_val; sleep_msec = sys_sleep->int_val;
@ -515,7 +519,7 @@ const char *
Sys_ConsoleInput (void) Sys_ConsoleInput (void)
{ {
static char text[256]; static char text[256];
int len; int len = 0;
#ifdef _WIN32 #ifdef _WIN32
int c; int c;

1
nq/source/sys_win.c
View file

@ -63,7 +63,6 @@ qboolean WinNT;
static double pfreq; static double pfreq;
static int lowshift; static int lowshift;
qboolean isDedicated; qboolean isDedicated;
static qboolean sc_return_on_enter = false;
HANDLE hinput, houtput; HANDLE hinput, houtput;
static const char tracking_tag[] = "Clams & Mooses"; static const char tracking_tag[] = "Clams & Mooses";

4
qw/source/sv_sys_win.c
View file

@ -31,9 +31,6 @@ static const char rcsid[] =
# include "config.h" # include "config.h"
#endif #endif
#include <conio.h>
#include <ctype.h>
#include <stdlib.h>
#include <winsock.h> #include <winsock.h>
#include "QF/cvar.h" #include "QF/cvar.h"
@ -83,7 +80,6 @@ int
main (int argc, const char **argv) main (int argc, const char **argv)
{ {
double newtime, time, oldtime; double newtime, time, oldtime;
int sleep_msec;
COM_InitArgv (argc, argv); COM_InitArgv (argc, argv);