adapt to new optional build strategy
This commit is contained in:
parent
44120d4157
commit
c03df2b4bd
|
@ -21,7 +21,7 @@ ifndef PDIR # {
|
|||
GEN_IMAGES= eagle.app.v6.out
|
||||
GEN_BINS= eagle.app.v6.bin
|
||||
OPT_MKTARGETS := coap crypto dht http mqtt pcm sjson sqlite3 tsl2561 websocket
|
||||
OPT_MKLIBTARGETS := u8g ucg
|
||||
OPT_MKLIBTARGETS := u8g2 ucg
|
||||
SEL_MKTARGETS := $(shell $(CC) -E -dM include/user_modules.h | sed -n '/^\#define LUA_USE_MODULES_/{s/.\{24\}\(.*\)/\L\1/; p}')
|
||||
OPT_SEL_MKLIBTARGETS := $(foreach tgt,$(OPT_MKLIBTARGETS),$(findstring $(tgt), $(SEL_MKTARGETS)))
|
||||
OPT_SEL_MKTARGETS := $(foreach tgt,$(OPT_MKTARGETS),$(findstring $(tgt), $(SEL_MKTARGETS))) \
|
||||
|
@ -38,7 +38,6 @@ SUBDIRS= \
|
|||
lua \
|
||||
lwip \
|
||||
task \
|
||||
u8g2lib \
|
||||
smart \
|
||||
modules \
|
||||
spiffs \
|
||||
|
@ -69,7 +68,6 @@ COMPONENTS_eagle.app.v6 = \
|
|||
libc/liblibc.a \
|
||||
lua/liblua.a \
|
||||
lwip/liblwip.a \
|
||||
u8g2lib/u8g2lib.a \
|
||||
smart/smart.a \
|
||||
spiffs/spiffs.a \
|
||||
fatfs/libfatfs.a \
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
# a generated lib/image xxx.a ()
|
||||
#
|
||||
ifndef PDIR
|
||||
GEN_LIBS = u8g2lib.a
|
||||
GEN_LIBS = libu8g2lib.a
|
||||
endif
|
||||
|
||||
STD_CFLAGS=-std=gnu11 -Wimplicit
|
||||
|
|
Loading…
Reference in New Issue