diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-05-30 13:14:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 13:14:59 -0700 |
| commit | fced377ac007d27f2650ccffbe0b18abcdcfe23d (patch) | |
| tree | bd5b141987394a5a16cfc416bfe2b9efdb14d067 /tmk_core/protocol/vusb.mk | |
| parent | 7b8a013826ad90714a05ea522de53adf964ab3b9 (diff) | |
| download | qmk_firmware-fced377ac007d27f2650ccffbe0b18abcdcfe23d.tar.gz qmk_firmware-fced377ac007d27f2650ccffbe0b18abcdcfe23d.zip | |
2020 May 30 Breaking Changes Update (#9215)
* Branch point for 2020 May 30 Breaking Change
* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954)
* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957)
* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958)
* Migrate `ACTION_LAYER_MODS` to `LM()` (#8959)
* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968)
* Convert V-USB usbdrv to a submodule (#8321)
* Unify Tap Hold functions and documentation (#8348)
* Changing board names to prevent confusion (#8412)
* Move the Keyboardio Model01 to a keyboardio/ subdir (#8499)
* Move spaceman keyboards (#8830)
* Migrate miscellaneous `fn_actions` entries (#8977)
* Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979)
* Organizing my keyboards (plaid, tartan, ergoinu) (#8537)
* Refactor Lily58 to use split_common (#6260)
* Refactor zinc to use split_common (#7114)
* Add a message if bin/qmk doesn't work (#9000)
* Fix conflicting types for 'tfp_printf' (#8269)
* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480)
* Refactor and updates to TKC1800 code (#8472)
* Switch to qmk forks for everything (#9019)
* audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484)
* Audio enable corrections (2/3) (#8903)
* Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582)
* Audio enable corrections (Part 4) (#8974)
* Fix typo from PR7114 (#9171)
* Augment future branch Changelogs (#8978)
* Revert "Branch point for 2020 May 30 Breaking Change"
Diffstat (limited to 'tmk_core/protocol/vusb.mk')
| -rw-r--r-- | tmk_core/protocol/vusb.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb.mk index 6df0d0d33..5e564f748 100644 --- a/tmk_core/protocol/vusb.mk +++ b/tmk_core/protocol/vusb.mk | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | VUSB_DIR = protocol/vusb | 1 | VUSB_DIR = protocol/vusb |
| 2 | 2 | ||
| 3 | OPT_DEFS += -DPROTOCOL_VUSB | 3 | # Path to the V-USB library |
| 4 | VUSB_PATH = $(LIB_PATH)/vusb | ||
| 4 | 5 | ||
| 5 | SRC += $(VUSB_DIR)/main.c \ | 6 | SRC += $(VUSB_DIR)/main.c \ |
| 6 | $(VUSB_DIR)/vusb.c \ | 7 | $(VUSB_DIR)/vusb.c \ |
| 7 | $(VUSB_DIR)/usbdrv/usbdrv.c \ | 8 | $(VUSB_PATH)/usbdrv/usbdrv.c \ |
| 8 | $(VUSB_DIR)/usbdrv/usbdrvasm.S \ | 9 | $(VUSB_PATH)/usbdrv/usbdrvasm.S \ |
| 9 | $(VUSB_DIR)/usbdrv/oddebug.c | 10 | $(VUSB_PATH)/usbdrv/oddebug.c |
| 10 | |||
| 11 | 11 | ||
| 12 | ifneq ($(strip $(CONSOLE_ENABLE)), yes) | 12 | ifneq ($(strip $(CONSOLE_ENABLE)), yes) |
| 13 | ifndef NO_UART | 13 | ifndef NO_UART |
| @@ -18,4 +18,6 @@ endif | |||
| 18 | 18 | ||
| 19 | # Search Path | 19 | # Search Path |
| 20 | VPATH += $(TMK_PATH)/$(VUSB_DIR) | 20 | VPATH += $(TMK_PATH)/$(VUSB_DIR) |
| 21 | VPATH += $(TMK_PATH)/$(VUSB_DIR)/usbdrv | 21 | VPATH += $(VUSB_PATH) |
| 22 | |||
| 23 | OPT_DEFS += -DPROTOCOL_VUSB | ||