diff options
| author | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
|---|---|---|
| committer | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
| commit | 2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch) | |
| tree | 3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /tmk_core/protocol/vusb.mk | |
| parent | 3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff) | |
| parent | 2013f6313430b977e557e482d30daa279a46e75d (diff) | |
| download | qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.zip | |
Merge branch 'master' into meteor
Diffstat (limited to 'tmk_core/protocol/vusb.mk')
| -rw-r--r-- | tmk_core/protocol/vusb.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb.mk index 5e564f748..1de600308 100644 --- a/tmk_core/protocol/vusb.mk +++ b/tmk_core/protocol/vusb.mk | |||
| @@ -9,13 +9,6 @@ SRC += $(VUSB_DIR)/main.c \ | |||
| 9 | $(VUSB_PATH)/usbdrv/usbdrvasm.S \ | 9 | $(VUSB_PATH)/usbdrv/usbdrvasm.S \ |
| 10 | $(VUSB_PATH)/usbdrv/oddebug.c | 10 | $(VUSB_PATH)/usbdrv/oddebug.c |
| 11 | 11 | ||
| 12 | ifneq ($(strip $(CONSOLE_ENABLE)), yes) | ||
| 13 | ifndef NO_UART | ||
| 14 | SRC += $(COMMON_DIR)/sendchar_uart.c \ | ||
| 15 | $(COMMON_DIR)/uart.c | ||
| 16 | endif | ||
| 17 | endif | ||
| 18 | |||
| 19 | # Search Path | 12 | # Search Path |
| 20 | VPATH += $(TMK_PATH)/$(VUSB_DIR) | 13 | VPATH += $(TMK_PATH)/$(VUSB_DIR) |
| 21 | VPATH += $(VUSB_PATH) | 14 | VPATH += $(VUSB_PATH) |