diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
| commit | 3a98bd75c88c5cc64aed72b9d2e3a8857d949fed (patch) | |
| tree | 7edcbbfa0c0efd16e456d6012f90833922d3bb3c /tmk_core/common.mk | |
| parent | b8031a1613290ada50f4cb746216fcae90d8935d (diff) | |
| parent | 99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3 (diff) | |
| download | qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.tar.gz qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 0e189962b..3cf3edde3 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -13,7 +13,6 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
| 13 | $(COMMON_DIR)/print.c \ | 13 | $(COMMON_DIR)/print.c \ |
| 14 | $(COMMON_DIR)/debug.c \ | 14 | $(COMMON_DIR)/debug.c \ |
| 15 | $(COMMON_DIR)/sendchar_null.c \ | 15 | $(COMMON_DIR)/sendchar_null.c \ |
| 16 | $(COMMON_DIR)/util.c \ | ||
| 17 | $(COMMON_DIR)/eeconfig.c \ | 16 | $(COMMON_DIR)/eeconfig.c \ |
| 18 | $(COMMON_DIR)/report.c \ | 17 | $(COMMON_DIR)/report.c \ |
| 19 | $(PLATFORM_COMMON_DIR)/suspend.c \ | 18 | $(PLATFORM_COMMON_DIR)/suspend.c \ |
| @@ -90,11 +89,6 @@ else | |||
| 90 | TMK_COMMON_DEFS += -DNO_DEBUG | 89 | TMK_COMMON_DEFS += -DNO_DEBUG |
| 91 | endif | 90 | endif |
| 92 | 91 | ||
| 93 | ifeq ($(strip $(COMMAND_ENABLE)), yes) | ||
| 94 | TMK_COMMON_SRC += $(COMMON_DIR)/command.c | ||
| 95 | TMK_COMMON_DEFS += -DCOMMAND_ENABLE | ||
| 96 | endif | ||
| 97 | |||
| 98 | ifeq ($(strip $(NKRO_ENABLE)), yes) | 92 | ifeq ($(strip $(NKRO_ENABLE)), yes) |
| 99 | ifeq ($(PROTOCOL), VUSB) | 93 | ifeq ($(PROTOCOL), VUSB) |
| 100 | $(info NKRO is not currently supported on V-USB, and has been disabled.) | 94 | $(info NKRO is not currently supported on V-USB, and has been disabled.) |