Merge branch 'master' into feature/mbedtls

This commit is contained in:
Angus Gratton 2016-09-09 17:09:56 +10:00
commit 9c51f8a7a3
3 changed files with 3 additions and 3 deletions

View file

@ -6,6 +6,6 @@ COMPONENT_ADD_INCLUDEDIRS := include/lwip include/lwip/port include/lwip/posix
COMPONENT_SRCDIRS := api apps/sntp apps core/ipv4 core/ipv6 core netif port/freertos port/netif port
CFLAGS += -Wno-error=address -Waddress -DLWIP_ESP8266
CFLAGS += -Wno-error=address -Waddress
include $(IDF_PATH)/make/component_common.mk

View file

@ -34,6 +34,8 @@
#include <stdlib.h>
/* Enable all Espressif-only options */
#define LWIP_ESP8266
/*
-----------------------------------------------

View file

@ -2,6 +2,4 @@
# Component Makefile
#
CFLAGS += -DLWIP_ESP8266
include $(IDF_PATH)/make/component_common.mk