corrections to dev merge

2018-04-20 02:34:52 +01:00 · 2018-04-20 02:34:52 +01:00 · 4f7af452a8
parent 6db7414270
commit 4f7af452a8
2 changed files with 3 additions and 7 deletions
--- a/app/Makefile
+++ b/app/Makefile
@ -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)


@ -141,7 +137,7 @@ CONFIGURATION_DEFINES =	-D__ets__ 		\
 			-DLWIP_OPEN_SRC 	\
 			-DPBUF_RSV_FOR_WLAN 	\
 			-DEBUF_LWIP		\
-			-DUSE_OPTIMIZE_PRINTF \
+			-DUSE_OPTIMIZE_PRINTF	\
 			-DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\"  \

 DEFINES += 					\
--- a/app/lua/Makefile
+++ b/app/lua/Makefile
@ -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!!