andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a possible name conflict in oslib.mk. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16296 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2023-06-19 17:29:16 +00:00
parent dcb1f9fc76
commit a208d65eba
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
os/oslib/oslib.mk
View File

@ -12,46 +12,46 @@ endif
CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define")) CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
LIBSRC := $(CHIBIOS)/os/oslib/src/chmemchecks.c OSLIBSRC := $(CHIBIOS)/os/oslib/src/chmemchecks.c
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chmboxes.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chmboxes.c
endif endif
ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chmemcore.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chmemcore.c
endif endif
ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chmemheaps.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chmemheaps.c
endif endif
ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chmempools.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chmempools.c
endif endif
ifneq ($(findstring CH_CFG_USE_PIPES TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_PIPES TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chpipes.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chpipes.c
endif endif
ifneq ($(findstring CH_CFG_USE_OBJ_CACHES TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_OBJ_CACHES TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chobjcaches.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chobjcaches.c
endif endif
ifneq ($(findstring CH_CFG_USE_DELEGATES TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_DELEGATES TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chdelegates.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chdelegates.c
endif endif
ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/oslib/src/chfactory.c OSLIBSRC += $(CHIBIOS)/os/oslib/src/chfactory.c
endif endif
else else
LIBSRC := $(CHIBIOS)/os/oslib/src/chmemchecks.c \ OSLIBSRC := $(CHIBIOS)/os/oslib/src/chmemchecks.c \
$(CHIBIOS)/os/oslib/src/chmboxes.c \ $(CHIBIOS)/os/oslib/src/chmboxes.c \
$(CHIBIOS)/os/oslib/src/chmemcore.c \ $(CHIBIOS)/os/oslib/src/chmemcore.c \
$(CHIBIOS)/os/oslib/src/chmemheaps.c \ $(CHIBIOS)/os/oslib/src/chmemheaps.c \
$(CHIBIOS)/os/oslib/src/chmempools.c \ $(CHIBIOS)/os/oslib/src/chmempools.c \
$(CHIBIOS)/os/oslib/src/chpipes.c \ $(CHIBIOS)/os/oslib/src/chpipes.c \
$(CHIBIOS)/os/oslib/src/chobjcaches.c \ $(CHIBIOS)/os/oslib/src/chobjcaches.c \
$(CHIBIOS)/os/oslib/src/chdelegates.c \ $(CHIBIOS)/os/oslib/src/chdelegates.c \
$(CHIBIOS)/os/oslib/src/chfactory.c $(CHIBIOS)/os/oslib/src/chfactory.c
endif endif
# Required include directories # Required include directories
LIBINC := $(CHIBIOS)/os/oslib/include OSLIBINC := $(CHIBIOS)/os/oslib/include
# Shared variables # Shared variables
ALLCSRC += $(LIBSRC) ALLCSRC += $(OSLIBSRC)
ALLINC += $(LIBINC) ALLINC += $(OSLIBINC)