alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-23 03:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/mbedtls

Browse Source
This commit is contained in:
Angus Gratton
2016-09-09 10:29:19 +10:00
parent 95defc7d32 add32cbc9a
commit 31e6b2cdb4
20 changed files with 350 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/Makefile → components/esp32/component.mk
View File

@@ -1,7 +1,7 @@
#
# Component Makefile
#
# This Makefile should, at the very least, just include $(IDF_PATH)/make/component.mk. By default,
# This Makefile should, at the very least, just include $(IDF_PATH)/make/component_common.mk. By default,
# this will take the sources in this directory, compile them and link them into
# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
# please read the esp-idf build system document if you need to do this.
@@ -35,7 +35,7 @@ COMPONENT_ADD_LDFLAGS := -lesp32 \
-L $(abspath ld) \
$(LINKER_SCRIPTS)
include $(IDF_PATH)/make/component.mk
include $(IDF_PATH)/make/component_common.mk
ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))