Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
c03df2b4
Commit
c03df2b4
authored
Jul 22, 2018
by
devsaurus
Browse files
adapt to new optional build strategy
parent
44120d41
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Makefile
View file @
c03df2b4
...
...
@@ -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
:=
u8g
2
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
\
...
...
app/u8g2lib/Makefile
View file @
c03df2b4
...
...
@@ -12,7 +12,7 @@
# a generated lib/image xxx.a ()
#
ifndef
PDIR
GEN_LIBS
=
u8g2lib.a
GEN_LIBS
=
lib
u8g2lib.a
endif
STD_CFLAGS
=
-std
=
gnu11
-Wimplicit
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment