X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Ftool%2Fchibios%2Fchibios.mk;h=5afcb1930dbb1b5f206e0b1a6b9ed1f5e49cb440;hb=8345571e1df07cdbe612541baa9e4f3441ad3f9e;hp=88ba94ae0e34da94aece6f0784cce844f338abe5;hpb=c7651089f2018c257f3e485d5350929a8bfa429d;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/tool/chibios/chibios.mk b/tmk_core/tool/chibios/chibios.mk
index 88ba94ae..5afcb193 100644
--- a/tmk_core/tool/chibios/chibios.mk
+++ b/tmk_core/tool/chibios/chibios.mk
@@ -142,6 +142,7 @@ CSRC = $(STARTUPSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
        $(STREAMSSRC) \
+       $(LIBSRC) \
        $(TMK_DIR)/protocol/chibios/usb_main.c \
        $(TMK_DIR)/protocol/chibios/main.c \
        $(SRC)
@@ -177,7 +178,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 INCDIR = $(CHIBIOS)/os/license \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(STREAMSINC) $(CHIBIOS)/os/various \
+         $(STREAMSINC) $(LIBINC) $(CHIBIOS)/os/various \
          $(TMK_DIR) $(COMMON_DIR) $(TMK_DIR)/protocol/chibios \
          $(TMK_DIR)/protocol $(TARGET_DIR)
 
@@ -256,6 +257,6 @@ endif
 
 RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
 ifeq ("$(wildcard $(RULESPATH)/rules.mk)","")
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
 endif
 include $(RULESPATH)/rules.mk