Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Move protocol makefiles into their respective folders (#21332)

Browse source 
* Move protocol makefiles into their respective folders

* Fix USB-USB converter
This commit is contained in:
Ryan 2023-06-23 00:07:28 +10:00 • committed by GitHub
commit aad5746682
Failed to generate hash of commit
7 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
builddefs/build_keyboard.mk
View file

@ -440,10 +440,11 @@ include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
ifneq ($(strip $(PROTOCOL)),) ifneq ($(strip $(PROTOCOL)),)
include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]'))
else else
include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk PROTOCOL_KEY = $(PLATFORM_KEY)
endif endif
include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk
# Setup definitions based on the selected MCU # Setup definitions based on the selected MCU
$(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU)) $(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))

2
tmk_core/protocol.mk
View file

@ -99,7 +99,7 @@ ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
endif endif
ifeq ($(strip $(USB_HID_ENABLE)), yes) ifeq ($(strip $(USB_HID_ENABLE)), yes)
include $(TMK_DIR)/protocol/usb_hid.mk include $(TMK_DIR)/protocol/usb_hid/usb_hid.mk
endif endif
# Search Path # Search Path

0
tmk_core/protocol/arm_atsam.mk → tmk_core/protocol/arm_atsam/arm_atsam.mk
View file

0
tmk_core/protocol/chibios.mk → tmk_core/protocol/chibios/chibios.mk
View file

0
tmk_core/protocol/lufa.mk → tmk_core/protocol/lufa/lufa.mk
View file

0
tmk_core/protocol/usb_hid.mk → tmk_core/protocol/usb_hid/usb_hid.mk
View file

0
tmk_core/protocol/vusb.mk → tmk_core/protocol/vusb/vusb.mk
View file