aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorinmarket <inmarket@ugfx.io>2017-06-24 16:36:31 +1000
committerinmarket <inmarket@ugfx.io>2017-06-24 16:36:31 +1000
commit10f4d9f860309d654567872645aaceb100a7c2d1 (patch)
tree50ec29ede623370ee00c55bb06f664ce730669cc /tools
parentd6c31f404bf2d6b2520b42717072ad2d22a7ff87 (diff)
downloaduGFX-10f4d9f860309d654567872645aaceb100a7c2d1.tar.gz
uGFX-10f4d9f860309d654567872645aaceb100a7c2d1.tar.bz2
uGFX-10f4d9f860309d654567872645aaceb100a7c2d1.zip
Updates to the ChibiOS Git version makefile
Diffstat (limited to 'tools')
-rw-r--r--tools/gmake_scripts/os_chibios_git.mk16
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/gmake_scripts/os_chibios_git.mk b/tools/gmake_scripts/os_chibios_git.mk
index 18d70c15..8f432ade 100644
--- a/tools/gmake_scripts/os_chibios_git.mk
+++ b/tools/gmake_scripts/os_chibios_git.mk
@@ -51,7 +51,7 @@ include $(CHIBIOS)/os/common/ports/$(CHIBIOS_CPUCLASS)/compilers/GCC/mk/port_$(C
ifneq ($(CHIBIOS_BOARD),)
include $(CHIBIOS)/os/hal/boards/$(CHIBIOS_BOARD)/board.mk
endif
-LIBPATH += $(CHIBIOS)/os/common/ports/$(CHIBIOS_CPUCLASS)/compilers/GCC
+LIBPATH += $(CHIBIOS)/os/common/startup/$(CHIBIOS_CPUCLASS)/compilers/GCC/ld
ifeq ($(LDSCRIPT),)
ifneq ($(CHIBIOS_LDSCRIPT),)
@@ -72,6 +72,20 @@ ifneq ($(LDSCRIPT),)
endif
endif
+ifeq ($(CHIBIOS_FATFS),1)
+ include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
+ INCPATH += $(FATFSINC)
+ SRC += $(FATFSSRC)
+endif
+
+ifeq ($(CHIBIOS_LWIP),1)
+ include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
+ INCPATH += $(LWINC) \
+ $(CHIBIOS)/os/various
+ SRC += $(LWSRC) \
+ $(CHIBIOS)/os/various/evtimer.c
+endif
+
# Add include files
INCPATH += $(CHIBIOS)/os/license \
$(STARTUPINC) \