summaryrefslogtreecommitdiff
path: root/tmk_core/protocol/usb_hid.mk
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2021-08-18 18:20:25 +1000
committerGitHub <noreply@github.com>2021-08-18 18:20:25 +1000
commitb16091659cc9a724a8800f77e631643b4ab089ad (patch)
treee44933472c6d100bd4fc5d8a693d9d21e3c32f6f /tmk_core/protocol/usb_hid.mk
parentcf5e40c25139ff64ff246f1c6280e983ef75551c (diff)
Move USB Host Shield and Arduino core to `lib/` (#13973)
Diffstat (limited to 'tmk_core/protocol/usb_hid.mk')
-rw-r--r--tmk_core/protocol/usb_hid.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/tmk_core/protocol/usb_hid.mk b/tmk_core/protocol/usb_hid.mk
index e720080979..c0c157c043 100644
--- a/tmk_core/protocol/usb_hid.mk
+++ b/tmk_core/protocol/usb_hid.mk
@@ -1,10 +1,10 @@
USB_HID_DIR = protocol/usb_hid
-
+USB_HOST_LIB_DIR = $(LIB_PATH)/usbhost
#
# USB Host Shield
#
-USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0
+USB_HOST_SHIELD_DIR = $(USB_HOST_LIB_DIR)/USB_Host_Shield_2.0
USB_HOST_SHIELD_SRC = \
$(USB_HOST_SHIELD_DIR)/Usb.cpp \
$(USB_HOST_SHIELD_DIR)/hid.cpp \
@@ -17,7 +17,7 @@ USB_HOST_SHIELD_SRC = \
#
# Arduino
#
-ARDUINO_DIR = $(USB_HID_DIR)/arduino-1.0.1
+ARDUINO_DIR = $(USB_HOST_LIB_DIR)/arduino-1.0.1
ARDUINO_CORES_DIR = $(ARDUINO_DIR)/cores/arduino
ARDUINO_CORES_SRC = \
$(ARDUINO_CORES_DIR)/Print.cpp \
@@ -58,13 +58,13 @@ OPT_DEFS += -DARDUINO=101
# Search Path
#
VPATH += $(TMK_DIR)/$(USB_HID_DIR)
-VPATH += $(TMK_DIR)/$(USB_HOST_SHIELD_DIR)
+VPATH += $(USB_HOST_SHIELD_DIR)
# for #include "Arduino.h"
-VPATH += $(TMK_DIR)/$(ARDUINO_CORES_DIR)
+VPATH += $(ARDUINO_CORES_DIR)
# for #include "pins_arduino.h"
-VPATH += $(TMK_DIR)/$(ARDUINO_DIR)/variants/leonardo
+VPATH += $(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.