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

View File

@ -44,8 +44,6 @@ SUBDIRS= \
net \
fatfs \
esp-gdbstub \
swTimer \
misc \
pm \
$(OPT_SEL_MKTARGETS)
@ -78,8 +76,6 @@ COMPONENTS_eagle.app.v6 = \
net/libnodemcu_net.a \
mbedtls/libmbedtls.a \
modules/libmodules.a \
swTimer/libswtimer.a \
misc/libmisc.a \
$(OPT_SEL_COMPONENTS)

View File

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