Replaced tabs with spaces to match TMK convention.

[qmk_firmware.git] / protocol / usb_hid.mk

diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk
index f3149f7f4bced040778ac00bfba8501f358db359..8fda76c2e5be959cc2b64ae645fb70807385ae4d 100644 (file)
--- a/protocol/usb_hid.mk
+++ b/protocol/usb_hid.mk
@@ -8,6 +8,7 @@ USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0
 USB_HOST_SHIELD_SRC = \
        $(USB_HOST_SHIELD_DIR)/Usb.cpp \
        $(USB_HOST_SHIELD_DIR)/hid.cpp \
+       $(USB_HOST_SHIELD_DIR)/usbhub.cpp \
        $(USB_HOST_SHIELD_DIR)/parsetools.cpp \
        $(USB_HOST_SHIELD_DIR)/message.cpp 
 
@@ -42,7 +43,7 @@ SRC += $(USB_HID_DIR)/override_Serial.cpp
 
 # replace arduino/wiring.c
 SRC += $(USB_HID_DIR)/override_wiring.c
-SRC += common/timer.c
+SRC += common/avr/timer.c
 
 SRC += $(USB_HOST_SHIELD_SRC)
 SRC += $(ARDUINO_CORES_SRC)
@@ -65,3 +66,9 @@ VPATH += $(TOP_DIR)/$(ARDUINO_CORES_DIR)
 
 # for #include "pins_arduino.h"
 VPATH += $(TOP_DIR)/$(ARDUINO_DIR)/variants/leonardo
+
+# ad hoc workaround for compile problem on Windows:
+#    Windows doesn't know difference between common/print.h and arduino/Print.h.
+#    On Linux no problem.
+#    Change file name common/print.h to console.h ?
+VPATH := $(TOP_DIR)/common $(VPATH)