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

corrections to dev merge

This commit is contained in:
TerryE 2018-04-20 02:34:52 +01:00
parent 6db7414270
commit 4f7af452a8
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Makefile
View File

@ -44,8 +44,6 @@ SUBDIRS= \
net \ net \
fatfs \ fatfs \
esp-gdbstub \ esp-gdbstub \
swTimer \
misc \
pm \ pm \
$(OPT_SEL_MKTARGETS) $(OPT_SEL_MKTARGETS)
@ -78,8 +76,6 @@ COMPONENTS_eagle.app.v6 = \
net/libnodemcu_net.a \ net/libnodemcu_net.a \
mbedtls/libmbedtls.a \ mbedtls/libmbedtls.a \
modules/libmodules.a \ modules/libmodules.a \
swTimer/libswtimer.a \
misc/libmisc.a \
$(OPT_SEL_COMPONENTS) $(OPT_SEL_COMPONENTS)
@ -141,7 +137,7 @@ CONFIGURATION_DEFINES = -D__ets__ \
-DLWIP_OPEN_SRC \ -DLWIP_OPEN_SRC \
-DPBUF_RSV_FOR_WLAN \ -DPBUF_RSV_FOR_WLAN \
-DEBUF_LWIP \ -DEBUF_LWIP \
-DUSE_OPTIMIZE_PRINTF \ -DUSE_OPTIMIZE_PRINTF \
-DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\" \ -DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\" \
DEFINES += \ DEFINES += \

4
app/lua/Makefile
View File

@ -25,8 +25,8 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# makefile at its root level - these are then overridden # makefile at its root level - these are then overridden
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
DEFINES += -DDEVELOPMENT_TOOLS -DDEVELOPMENT_USE_GDB -DNODE_DEBUG -DDEVELOPMENT_BREAK_ON_STARTUP_PIN=1 #DEFINES += -DDEVELOPMENT_TOOLS -DDEVELOPMENT_USE_GDB -DDEVELOPMENT_BREAK_ON_STARTUP_PIN=1
EXTRA_CCFLAGS += -ggdb -O0 #EXTRA_CCFLAGS += -ggdb -O0
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!