Renamed the drivers folder to app_drivers because of a library name conflict. Moved bad makefile lib linkage

This commit is contained in:
anschrammh 2023-01-02 21:07:40 +01:00
parent 59765a6fc3
commit 47dca73834
25 changed files with 27 additions and 27 deletions

View File

@ -31,7 +31,8 @@ endif
COMPONENTS_$(TARGET) = \
$(TOP_DIR)/app/libuser$(LIB_EXT) \
$(TOP_DIR)/lvgl/liblvgl$(LIB_EXT)
$(TOP_DIR)/app/app_drivers/libappdrivers$(LIB_EXT) \
$(TOP_DIR)/lvgl/liblvgl$(LIB_EXT)
ifeq ($(USE_LIB), 0)
COMPONENTS_$(TARGET) += \

View File

@ -0,0 +1,18 @@
TOP_DIR = ../..
sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libappdrivers$(LIB_EXT)
COMPONENTS_libappdrivers = lcd/libappdriverslcd$(LIB_EXT) \
mmc_sdio/libappdriversmmc_sdio$(LIB_EXT) \
i2c/libappdriversi2c$(LIB_EXT)
endif
#DEFINES +=
sinclude $(TOP_DIR)/tools/w800/rules.mk
INCLUDES := $(INCLUDES) -I $(PDIR)include
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile

View File

@ -2,7 +2,7 @@ TOP_DIR = ../../..
sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libdriversi2c$(LIB_EXT)
GEN_LIBS = libappdriversi2c$(LIB_EXT)
endif
#DEFINES +=

View File

@ -2,7 +2,7 @@ TOP_DIR = ../../..
sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libdriverslcd$(LIB_EXT)
GEN_LIBS = libappdriverslcd$(LIB_EXT)
endif
#DEFINES +=

View File

@ -2,7 +2,7 @@ TOP_DIR = ../../..
sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libdriversmmc_sdio$(LIB_EXT)
GEN_LIBS = libappdriversmmc_sdio$(LIB_EXT)
endif
#DEFINES +=

View File

@ -1,18 +0,0 @@
TOP_DIR = ../..
sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libdrivers$(LIB_EXT)
COMPONENTS_libdrivers = lcd/libdriverslcd$(LIB_EXT) \
mmc_sdio/libdriversmmc_sdio$(LIB_EXT) \
i2c/libdriversi2c$(LIB_EXT)
endif
#DEFINES +=
sinclude $(TOP_DIR)/tools/w800/rules.mk
INCLUDES := $(INCLUDES) -I $(PDIR)include
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile

View File

@ -3,8 +3,7 @@ sinclude $(TOP_DIR)/tools/w800/conf.mk
ifndef PDIR
GEN_LIBS = libusergfx$(LIB_EXT)
COMPONENTS_libusergfx = assets/libusergfxassets$(LIB_EXT) \
../drivers/libdrivers$(LIB_EXT)
COMPONENTS_libusergfx = assets/libusergfxassets$(LIB_EXT)
endif
#DEFINES +=

View File

@ -44,9 +44,9 @@ INCLUDES += -I $(TOP_DIR)/src/os/rtos/include
INCLUDES += -I $(TOP_DIR)/src/app/factorycmd
INCLUDES += -I $(TOP_DIR)/src/app/bleapp
INCLUDES += -I $(TOP_DIR)/app/app_include
INCLUDES += -I $(TOP_DIR)/app/drivers/lcd
INCLUDES += -I $(TOP_DIR)/app/drivers/mmc_sdio
INCLUDES += -I $(TOP_DIR)/app/drivers/i2c
INCLUDES += -I $(TOP_DIR)/app/app_drivers/lcd
INCLUDES += -I $(TOP_DIR)/app/app_drivers/mmc_sdio
INCLUDES += -I $(TOP_DIR)/app/app_drivers/i2c
INCLUDES += -I $(TOP_DIR)/app/gfx
INCLUDES += -I $(TOP_DIR)/app