Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3a98bd75c8
14 changed files with 22 additions and 50 deletions
|
@ -13,7 +13,6 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
|
|||
$(COMMON_DIR)/print.c \
|
||||
$(COMMON_DIR)/debug.c \
|
||||
$(COMMON_DIR)/sendchar_null.c \
|
||||
$(COMMON_DIR)/util.c \
|
||||
$(COMMON_DIR)/eeconfig.c \
|
||||
$(COMMON_DIR)/report.c \
|
||||
$(PLATFORM_COMMON_DIR)/suspend.c \
|
||||
|
@ -90,11 +89,6 @@ else
|
|||
TMK_COMMON_DEFS += -DNO_DEBUG
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(COMMAND_ENABLE)), yes)
|
||||
TMK_COMMON_SRC += $(COMMON_DIR)/command.c
|
||||
TMK_COMMON_DEFS += -DCOMMAND_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(NKRO_ENABLE)), yes)
|
||||
ifeq ($(PROTOCOL), VUSB)
|
||||
$(info NKRO is not currently supported on V-USB, and has been disabled.)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue