From 803c9defae0db04ccc1081d02aa41e2d65aee92e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 21 Dec 2021 17:40:42 +0900 Subject: [PATCH] [input] Clean out more keys.h refs --- include/QF/Makemodule.am | 6 ++++-- include/QF/input.h | 2 -- libs/gib/gib_keys.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am index 4fadd6bfe..ff47836db 100644 --- a/include/QF/Makemodule.am +++ b/include/QF/Makemodule.am @@ -190,8 +190,10 @@ include_qf_vulkan = \ include/QF/Vulkan/swapchain.h # headers shared with ruamoko -qfcc_include_qf = include/QF/keys.h -qfcc_include_qf_input = include/QF/input/binding.h +qfcc_include_qf = include/QF/input.h +qfcc_include_qf_input = \ + include/QF/input/binding.h \ + include/QF/input/imt.h qf_includedir = $(includedir)/QF qf_gl_includedir = $(includedir)/QF/GL diff --git a/include/QF/input.h b/include/QF/input.h index 97eaa0a22..671a3474d 100644 --- a/include/QF/input.h +++ b/include/QF/input.h @@ -28,8 +28,6 @@ #ifndef __QF_input_h #define __QF_input_h -#include "QF/keys.h" - typedef struct in_axisinfo_s { int deviceid; int axis; diff --git a/libs/gib/gib_keys.c b/libs/gib/gib_keys.c index a45428acd..ae5aea823 100644 --- a/libs/gib/gib_keys.c +++ b/libs/gib/gib_keys.c @@ -40,6 +40,7 @@ #include "QF/input.h" #include "QF/sys.h" #include "QF/gib.h" +#include "QF/keys.h" #include "compat.h" #include "old_keys.h"