diff options
author | Stick <nstickney@gmail.com> | 2017-06-22 20:06:30 +0200 |
---|---|---|
committer | Stick <nstickney@gmail.com> | 2017-06-22 20:06:30 +0200 |
commit | fa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch) | |
tree | 85a7b88c4b1f3898c606af013a478db39dc392b5 /tmk_core/common.mk | |
parent | 4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff) | |
parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
download | qmk_firmware-fa96d64f3761e6cd0661c63a3fc257b58c669be0.tar.gz qmk_firmware-fa96d64f3761e6cd0661c63a3fc257b58c669be0.tar.xz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index edec2acb4..75b810d98 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -3,6 +3,8 @@ ifeq ($(PLATFORM),AVR) PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr else ifeq ($(PLATFORM),CHIBIOS) PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios +else + PLATFORM_COMMON_DIR = $(COMMON_DIR)/test endif TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ @@ -16,6 +18,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/debug.c \ $(COMMON_DIR)/util.c \ $(COMMON_DIR)/eeconfig.c \ + $(COMMON_DIR)/report.c \ $(PLATFORM_COMMON_DIR)/suspend.c \ $(PLATFORM_COMMON_DIR)/timer.c \ $(PLATFORM_COMMON_DIR)/bootloader.c \ @@ -29,6 +32,10 @@ ifeq ($(PLATFORM),CHIBIOS) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c endif +ifeq ($(PLATFORM),TEST) + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c +endif + # Option modules |