qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix win32 (mingw) builds.

This commit is contained in:
Bill Currie 2012-02-07 20:18:23 +09:00
parent 0a277376ed
commit b59ffd4cf1
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/in_win.h
View File

@ -33,15 +33,10 @@
extern qboolean mouseactive; extern qboolean mouseactive;
extern float mouse_x, mouse_y; extern float mouse_x, mouse_y;
extern void IN_UpdateClipCursor (void); void IN_UpdateClipCursor (void);
extern void IN_ShowMouse (void); void IN_ShowMouse (void);
extern void IN_HideMouse (void); void IN_HideMouse (void);
extern void IN_ActivateMouse (void); void IN_ActivateMouse (void);
extern void IN_DeactivateMouse (void); void IN_DeactivateMouse (void);
extern void IN_Init (void);
extern void IN_Shutdown (void);
extern void IN_Move (void);
extern void IN_Accumulate (void);
extern void IN_Commands (void);
#endif // _IN_WIN_H #endif // _IN_WIN_H

1
libs/video/targets/in_win.c
View File

@ -123,7 +123,6 @@ static DIDATAFORMAT df = {
// forward-referenced functions, joy // forward-referenced functions, joy
void void
IN_UpdateClipCursor (void) IN_UpdateClipCursor (void)
{ {

2
qw/source/Makefile.am
View File

@ -88,7 +88,7 @@ qw_server_DEPENDENCIES= $(qw_server_deps)
qw_master_deps=$(top_builddir)/libs/util/libQFutil.la qw_master_deps=$(top_builddir)/libs/util/libQFutil.la
qw_master_SOURCES= master.c qw_master_SOURCES= master.c
qw_master_LDADD= $(qw_master_deps) $(NET_LIBS) qw_master_LDADD= $(qw_master_deps) $(NET_LIBS)
qw_master_DEPENDENCIES= $(qw_master_deps) $(NET_LIBS) qw_master_DEPENDENCIES= $(qw_master_deps)
qw_master_LDFLAGS= $(common_ldflags) qw_master_LDFLAGS= $(common_ldflags)
cl_plugin_LIBS= \ cl_plugin_LIBS= \

1
tools/cross/mingw/cross-make.sh
View File

@ -2,6 +2,7 @@
HOST_CC=gcc HOST_CC=gcc
export HOST_CC export HOST_CC
MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 MINGW=/home/bill/src/mingw/mingw-cross-env-2.18
export PKG_CONFIG_PATH=$MINGW/usr/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH export PATH=$MINGW/usr/bin:$PATH
make PAK=pak QFCC=qfcc $* make PAK=pak QFCC=qfcc $*