diff options
author | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2013-04-20 00:46:48 +0900 |
commit | 2fc681b4f768484c2ba5cfa22662bf4c09586e57 (patch) | |
tree | ead46c28553b5225699d36e416b10ef2c129ae70 /protocol/iwrap.mk | |
parent | 246031b6471a364f082c0eb4a0fb858821ae767b (diff) | |
parent | 663027751831eb0e80d64c90aaf82d2921533aed (diff) | |
download | qmk_firmware-2fc681b4f768484c2ba5cfa22662bf4c09586e57.tar.gz qmk_firmware-2fc681b4f768484c2ba5cfa22662bf4c09586e57.zip |
Merge branch 'iwrap5'
Diffstat (limited to 'protocol/iwrap.mk')
-rw-r--r-- | protocol/iwrap.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk index 96aa4140ca..e1d0efe69d 100644 --- a/protocol/iwrap.mk +++ b/protocol/iwrap.mk @@ -2,10 +2,22 @@ IWRAP_DIR = protocol/iwrap OPT_DEFS += -DPROTOCOL_IWRAP -SRC += $(IWRAP_DIR)/iwrap.c \ +SRC += $(IWRAP_DIR)/main.c \ + $(IWRAP_DIR)/iwrap.c \ $(IWRAP_DIR)/suart.S \ - $(IWRAP_DIR)/sendchar_uart.c \ - $(IWRAP_DIR)/uart.c + $(COMMON_DIR)/sendchar_uart.c \ + $(COMMON_DIR)/uart.c + +# TODO: compatible with LUFA and PJRC +# V-USB +# +#VUSB_DIR = protocol/vusb +#OPT_DEFS += -DPROTOCOL_VUSB +#SRC += $(VUSB_DIR)/vusb.c \ +# $(VUSB_DIR)/usbdrv/usbdrv.c \ +# $(VUSB_DIR)/usbdrv/usbdrvasm.S \ +# $(VUSB_DIR)/usbdrv/oddebug.c +#VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv # Search Path |