Renamed the drivers folder to app_drivers because of a library name conflict. Moved bad makefile lib linkage
This commit is contained in:
parent
59765a6fc3
commit
47dca73834
@ -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) += \
|
||||
|
18
src/W800 SDK v1.00.08/app/app_drivers/Makefile
Normal file
18
src/W800 SDK v1.00.08/app/app_drivers/Makefile
Normal 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
|
@ -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 +=
|
@ -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 +=
|
@ -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 +=
|
@ -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
|
@ -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 +=
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user