mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-22 04:01:17 +00:00
server builds (and works, thanks for the test, Dabb) and an sdl client attempts
to link.
This commit is contained in:
Bill Currie
parent
f1a5a25b69
commit
21654b12e5
8 changed files with 32 additions and 29 deletions
|
|
@ -106,5 +106,8 @@
|
|||
/* Define this if you want to have packet logging */
|
||||
#undef PACKET_LOGGING
|
||||
|
||||
/* Define this if you have fnmatch.h */
|
||||
#undef HAVE_FNMATCH_H
|
||||
|
||||
@BOTTOM@
|
||||
#endif // __config_h_
|
||||
|
|
|
|||
15
configure.in
15
configure.in
|
|
@ -35,10 +35,13 @@ AC_LANG_C
|
|||
endian=""
|
||||
case "$host_os" in
|
||||
mingw32*)
|
||||
mingw=yes
|
||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32"
|
||||
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include/win32/resources"
|
||||
CC=i386-mingw32msvc-gcc
|
||||
endian="little"
|
||||
if test $host != $build; then
|
||||
CC=$host_cpu-$host_os-gcc
|
||||
endian="little"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -98,7 +101,13 @@ AC_CHECK_HEADERS(
|
|||
sys/time.h sys/types.h sys/wait.h time.h unistd.h vga.h \
|
||||
vgakeyboard.h vgamouse.h windows.h winsock.h zlib.h
|
||||
)
|
||||
|
||||
if test "x$mingw" = xyes; then
|
||||
AC_MSG_CHECKING(for fnmatch.h)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_FNMATCH_H)
|
||||
else
|
||||
AC_CHECK_HEADERS(fnmatch.h)
|
||||
fi
|
||||
|
||||
dnl ==================================================================
|
||||
dnl Checks for typedefs, structures, and compiler characteristics
|
||||
|
|
|
|||
|
|
@ -97,6 +97,8 @@ void VID_UnlockBuffer (void);
|
|||
|
||||
qboolean VID_Is8bit (void);
|
||||
|
||||
void VID_RaiseWindow (void);
|
||||
void VID_MinimiseWindow (void);
|
||||
void VID_SetCaption (char *text);
|
||||
// used to set window caption
|
||||
|
||||
|
|
|
|||
|
|
@ -67,9 +67,6 @@
|
|||
#include "cvar.h"
|
||||
#include "draw.h"
|
||||
#include "host.h"
|
||||
#ifdef _WIN32
|
||||
# include "in_win.h"
|
||||
#endif
|
||||
#include "input.h"
|
||||
#include "keys.h"
|
||||
#include "menu.h"
|
||||
|
|
@ -89,7 +86,6 @@
|
|||
#include "vid.h"
|
||||
#include "view.h"
|
||||
#include "va.h"
|
||||
#include "winquake.h"
|
||||
|
||||
#ifdef __sun
|
||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
|
|
@ -927,8 +923,7 @@ CL_ConnectionlessPacket (void)
|
|||
return;
|
||||
}
|
||||
#ifdef _WIN32
|
||||
ShowWindow (mainwindow, SW_RESTORE);
|
||||
SetForegroundWindow (mainwindow);
|
||||
VID_RaiseWindow ();
|
||||
#endif
|
||||
s = MSG_ReadString ();
|
||||
|
||||
|
|
@ -1160,10 +1155,7 @@ CL_Minimize_f
|
|||
void
|
||||
CL_Windows_f (void)
|
||||
{
|
||||
// if (modestate == MS_WINDOWED)
|
||||
// ShowWindow(mainwindow, SW_MINIMIZE);
|
||||
// else
|
||||
SendMessage (mainwindow, WM_SYSKEYUP, VK_TAB, 1 | (0x0F << 16) | (1 << 29));
|
||||
VID_MinimiseWindow ();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include "bothdefs.h"
|
||||
#include "cl_ents.h"
|
||||
#include "client.h"
|
||||
|
|
@ -38,12 +40,6 @@
|
|||
#include "cvar.h"
|
||||
#include "pmove.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "winquake.h"
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
|
||||
cvar_t *cl_nopred;
|
||||
cvar_t *cl_pushlatency;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,9 @@
|
|||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#ifdef HAVE_WINDOWS_H
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include "cl_input.h"
|
||||
#include "cl_main.h"
|
||||
|
|
@ -66,7 +69,6 @@
|
|||
#include "va.h"
|
||||
#include "vid.h"
|
||||
#include "view.h"
|
||||
#include "winquake.h"
|
||||
|
||||
void (*vid_menudrawfn) (void);
|
||||
void (*vid_menukeyfn) (int key);
|
||||
|
|
@ -589,14 +591,14 @@ M_Options_Draw (void)
|
|||
M_Print (16, 152, " Video Options");
|
||||
|
||||
#ifdef _WIN32
|
||||
if (modestate == MS_WINDOWED) {
|
||||
//FIXMEif (modestate == MS_WINDOWED) {
|
||||
#endif
|
||||
if (_windowed_mouse) {
|
||||
M_Print (16, 160, " Use Mouse");
|
||||
M_DrawCheckbox (220, 160, _windowed_mouse->int_val);
|
||||
}
|
||||
#ifdef _WIN32
|
||||
}
|
||||
//FIXME}
|
||||
#endif
|
||||
|
||||
// cursor
|
||||
|
|
@ -642,9 +644,9 @@ M_Options_Key (int k)
|
|||
if (options_cursor < 0)
|
||||
options_cursor = OPTIONS_ITEMS - 1;
|
||||
#ifdef _WIN32
|
||||
if (options_cursor == 16
|
||||
&& (!(_windowed_mouse)
|
||||
|| (modestate != MS_WINDOWED))) options_cursor--;
|
||||
//FIXMEif (options_cursor == 16
|
||||
//FIXME&& (!(_windowed_mouse)
|
||||
//FIXME|| (modestate != MS_WINDOWED))) options_cursor--;
|
||||
#endif
|
||||
if (options_cursor == 15 && !(vid_menudrawfn))
|
||||
options_cursor--;
|
||||
|
|
@ -656,8 +658,8 @@ M_Options_Key (int k)
|
|||
if (options_cursor == 15 && !(vid_menudrawfn))
|
||||
options_cursor++;
|
||||
#ifdef _WIN32
|
||||
if (options_cursor == 16 && (!(_windowed_mouse) || (modestate != MS_WINDOWED))) // ARGH!!!!!
|
||||
options_cursor++;
|
||||
//FIXMEif (options_cursor == 16 && (!(_windowed_mouse) || (modestate != MS_WINDOWED))) // ARGH!!!!!
|
||||
//FIXMEoptions_cursor++;
|
||||
#endif
|
||||
if (options_cursor >= OPTIONS_ITEMS)
|
||||
options_cursor = 0;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
//# include "winquake.h"
|
||||
# undef EWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
#define model_t quakeforgemodel_t
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <winquake.h>
|
||||
# include <windows.h>
|
||||
# undef EWOULDBLOCK
|
||||
# define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue