diff --git a/include/in_win.h b/include/in_win.h index a0a2e3184..a961e61e3 100644 --- a/include/in_win.h +++ b/include/in_win.h @@ -33,15 +33,10 @@ extern qboolean mouseactive; extern float mouse_x, mouse_y; -extern void IN_UpdateClipCursor (void); -extern void IN_ShowMouse (void); -extern void IN_HideMouse (void); -extern void IN_ActivateMouse (void); -extern 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); +void IN_UpdateClipCursor (void); +void IN_ShowMouse (void); +void IN_HideMouse (void); +void IN_ActivateMouse (void); +void IN_DeactivateMouse (void); #endif // _IN_WIN_H diff --git a/libs/video/targets/in_win.c b/libs/video/targets/in_win.c index 3d777a18f..c613eed79 100644 --- a/libs/video/targets/in_win.c +++ b/libs/video/targets/in_win.c @@ -123,7 +123,6 @@ static DIDATAFORMAT df = { // forward-referenced functions, joy - void IN_UpdateClipCursor (void) { diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 96bac9222..0a3d5030e 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -88,7 +88,7 @@ qw_server_DEPENDENCIES= $(qw_server_deps) qw_master_deps=$(top_builddir)/libs/util/libQFutil.la qw_master_SOURCES= master.c 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) cl_plugin_LIBS= \ diff --git a/tools/cross/mingw/cross-make.sh b/tools/cross/mingw/cross-make.sh index 4f8c154cd..834e2ff1b 100755 --- a/tools/cross/mingw/cross-make.sh +++ b/tools/cross/mingw/cross-make.sh @@ -2,6 +2,7 @@ HOST_CC=gcc export HOST_CC MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 +export PKG_CONFIG_PATH=$MINGW/usr/lib/pkgconfig export PATH=$MINGW/usr/bin:$PATH make PAK=pak QFCC=qfcc $*