diff options
| author | Joel Challis <git@zvecr.com> | 2021-02-07 13:56:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 13:56:08 +0000 |
| commit | 02881427692b682287d19fe533c3b84aa7b42a26 (patch) | |
| tree | b64dfc778cf652a04b337f8067dac1cd2a1cfe05 | |
| parent | 0c44aa950334a4956dbe1d3f1e4830c13eb38b45 (diff) | |
Migrate mousekey to quantum (#11804)
| -rw-r--r-- | common_features.mk | 6 | ||||
| -rw-r--r-- | quantum/mousekey.c (renamed from tmk_core/common/mousekey.c) | 0 | ||||
| -rw-r--r-- | quantum/mousekey.h (renamed from tmk_core/common/mousekey.h) | 2 | ||||
| -rw-r--r-- | tmk_core/common.mk | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/common_features.mk b/common_features.mk index 6365955a7f..7c956cbf2f 100644 --- a/common_features.mk +++ b/common_features.mk @@ -79,6 +79,12 @@ ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes) SRC += $(QUANTUM_DIR)/fauxclicky.c endif +ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) + OPT_DEFS += -DMOUSEKEY_ENABLE + OPT_DEFS += -DMOUSE_ENABLE + SRC += $(QUANTUM_DIR)/mousekey.c +endif + ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) OPT_DEFS += -DPOINTING_DEVICE_ENABLE OPT_DEFS += -DMOUSE_ENABLE diff --git a/tmk_core/common/mousekey.c b/quantum/mousekey.c index 63e74baa93..63e74baa93 100644 --- a/tmk_core/common/mousekey.c +++ b/quantum/mousekey.c diff --git a/tmk_core/common/mousekey.h b/quantum/mousekey.h index 52b8fe10e1..70dc4bb5c5 100644 --- a/tmk_core/common/mousekey.h +++ b/quantum/mousekey.h @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include <stdbool.h> +#include <stdint.h> #include "host.h" #ifndef MK_3_SPEED diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 05839824c0..0e189962be 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -68,10 +68,6 @@ ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) endif ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) - TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c - TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE - TMK_COMMON_DEFS += -DMOUSE_ENABLE - ifeq ($(strip $(MOUSE_SHARED_EP)), yes) TMK_COMMON_DEFS += -DMOUSE_SHARED_EP SHARED_EP_ENABLE = yes |