update Makefile, fix websocket_demo compile issue;

This commit is contained in:
Espressif Systems
2015-11-10 13:56:03 +08:00
parent d091945abf
commit 5164a74d46
2 changed files with 30 additions and 24 deletions

View File

@ -396,6 +396,10 @@ $(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
# #
INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include -I $(SDK_PATH)/extra_include INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include -I $(SDK_PATH)/extra_include
INCLUDES += -I $(SDK_PATH)/include/lwip -I $(SDK_PATH)/include/lwip/ipv4 -I $(SDK_PATH)/include/lwip/ipv6
INCLUDES += -I $(SDK_PATH)/include/espressif INCLUDES += -I $(SDK_PATH)/include/espressif
INCLUDES += -I $(SDK_PATH)/include/lwip
INCLUDES += -I $(SDK_PATH)/include/lwip/ipv4
INCLUDES += -I $(SDK_PATH)/include/lwip/ipv6
INCLUDES += -I $(SDK_PATH)/include/nopoll
INCLUDES += -I $(SDK_PATH)/include/spiffs INCLUDES += -I $(SDK_PATH)/include/spiffs
INCLUDES += -I $(SDK_PATH)/include/ssl

View File

@ -49,29 +49,31 @@ COMPONENTS_eagle.app.v6 = \
user/libuser.a \ user/libuser.a \
websocket/libwebsocket.a websocket/libwebsocket.a
LINKFLAGS_eagle.app.v6 = \ LINKFLAGS_eagle.app.v6 = \
-L$(SDK_PATH)/lib \ -L$(SDK_PATH)/lib \
-Wl,--gc-sections \ -Wl,--gc-sections \
-nostdlib \ -nostdlib \
-T$(LD_FILE) \ -T$(LD_FILE) \
-Wl,--no-check-sections \ -Wl,--no-check-sections \
-u call_user_start \ -u call_user_start \
-Wl,-static \ -Wl,-static \
-Wl,--start-group \ -Wl,--start-group \
-lminic \ -lcirom \
-lgcc \ -lgcc \
-lhal \ -lhal \
-lphy \ -lcrypto \
-lpp \ -lfreertos \
-lnet80211 \ -llwip \
-lwpa \ -lmain \
-lcrypto \ -lnet80211 \
-lmain \ -lnopoll \
-lfreertos \ -lphy \
-llwip \ -lpp \
-lsmartconfig \ -lsmartconfig \
$(DEP_LIBS_eagle.app.v6) \ -lssl \
-Wl,--end-group -lwpa \
$(DEP_LIBS_eagle.app.v6)\
-Wl,--end-group
DEPENDS_eagle.app.v6 = \ DEPENDS_eagle.app.v6 = \
$(LD_FILE) \ $(LD_FILE) \