mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 22:31:05 +00:00
move bi_keys from csqc to pr_keys in targets allowing the server to link
with libQFcsqc (need a new name:P)
This commit is contained in:
parent
6b559077dc
commit
09d89a3214
5 changed files with 6 additions and 3 deletions
|
@ -11,4 +11,4 @@ libQFgamecode_builtins_la_SOURCES= pr_cmds.c
|
|||
libQFcsqc_la_LDFLAGS= -version-info 1:0:0
|
||||
libQFcsqc_la_SOURCES=\
|
||||
bi_cbuf.c bi_cmd.c bi_cvar.c bi_file.c bi_init.c bi_inputline.c \
|
||||
bi_keys.c bi_string.c bi_strhash.c
|
||||
bi_string.c bi_strhash.c
|
||||
|
|
|
@ -37,7 +37,6 @@ static void (*const cbuf_progs_init)(progs_t *) = Cbuf_Progs_Init;
|
|||
static void (*const cvar_progs_init)(progs_t *) = Cvar_Progs_Init;
|
||||
static void (*const cmd_progs_init)(progs_t *) = Cmd_Progs_Init;
|
||||
static void (*const file_progs_init)(progs_t *) = File_Progs_Init;
|
||||
static void (*const key_progs_init)(progs_t *) = Key_Progs_Init;
|
||||
static void (*const inputline_progs_init)(progs_t *) = InputLine_Progs_Init;
|
||||
static void (*const string_progs_init)(progs_t *) = String_Progs_Init;
|
||||
static void (*const stringhashe_progs_init)(progs_t *) = StringHash_Progs_Init;
|
||||
|
|
|
@ -39,7 +39,8 @@ libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS)
|
|||
libQFjs_la_SOURCES= joy.c $(joy_src)
|
||||
EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
|
||||
|
||||
libcommon_la_SOURCES= in_common.c in_event.c keys.c old_keys.c vid.c
|
||||
libcommon_la_SOURCES= \
|
||||
in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
|
||||
libcommon_la_CFLAGS= @PREFER_NON_PIC@
|
||||
libcommon_la_LDFLAGS= -static
|
||||
|
||||
|
|
|
@ -44,6 +44,7 @@ static const char rcsid[] =
|
|||
#include "QF/cbuf.h"
|
||||
#include "QF/cmd.h"
|
||||
#include "QF/console.h"
|
||||
#include "QF/csqc.h"
|
||||
#include "QF/cvar.h"
|
||||
#include "QF/keys.h"
|
||||
#include "QF/screen.h"
|
||||
|
@ -53,6 +54,8 @@ static const char rcsid[] =
|
|||
#include "compat.h"
|
||||
#include "old_keys.h"
|
||||
|
||||
static void (*const key_progs_init)(struct progs_s *) = Key_Progs_Init;
|
||||
|
||||
/* key up events are sent even if in console mode */
|
||||
|
||||
cvar_t *in_bind_imt;
|
||||
|
|
Loading…
Reference in a new issue