Moved sdk submodules for easier branch switching.
This commit is contained in:
parent
4695eb3b12
commit
d33945b68b
|
@ -1,6 +1,6 @@
|
||||||
[submodule "esp8266-rtos-sdk"]
|
[submodule "esp8266-rtos-sdk"]
|
||||||
path = esp8266-rtos-sdk
|
path = sdk/esp8266-rtos-sdk
|
||||||
url = https://github.com/espressif/ESP8266_RTOS_SDK.git
|
url = https://github.com/espressif/ESP8266_RTOS_SDK.git
|
||||||
[submodule "esp32-rtos-sdk"]
|
[submodule "esp32-rtos-sdk"]
|
||||||
path = esp32-rtos-sdk
|
path = sdk/esp32-rtos-sdk
|
||||||
url = https://github.com/espressif/ESP32_RTOS_SDK.git
|
url = https://github.com/espressif/ESP32_RTOS_SDK.git
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -40,7 +40,7 @@ endif
|
||||||
|
|
||||||
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
|
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
|
||||||
TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
|
TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
|
||||||
SDKDIR:=$(TOP_DIR)/$(TARGET)-rtos-sdk
|
SDKDIR:=$(TOP_DIR)/sdk/$(TARGET)-rtos-sdk
|
||||||
|
|
||||||
# This is, sadly, the cleanest way to resolve the different non-standard
|
# This is, sadly, the cleanest way to resolve the different non-standard
|
||||||
# conventions for sized integers across the various components.
|
# conventions for sized integers across the various components.
|
||||||
|
@ -88,7 +88,7 @@ ESPTOOL ?= ../tools/esptool.py
|
||||||
CSRCS ?= $(wildcard *.c)
|
CSRCS ?= $(wildcard *.c)
|
||||||
ASRCs ?= $(wildcard *.s)
|
ASRCs ?= $(wildcard *.s)
|
||||||
ASRCS ?= $(wildcard *.S)
|
ASRCS ?= $(wildcard *.S)
|
||||||
SUBDIRS ?= $(filter-out esp8266-rtos-sdk esp32-rtos-sdk, $(patsubst %/,%,$(dir $(wildcard */Makefile))))
|
SUBDIRS ?= $(patsubst %/,%,$(dir $(wildcard */Makefile)))
|
||||||
|
|
||||||
ODIR := .output
|
ODIR := .output
|
||||||
OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj
|
OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
../../esp32-rtos-sdk/include
|
../../sdk/esp32-rtos-sdk/include
|
|
@ -0,0 +1,2 @@
|
||||||
|
sdks: ;
|
||||||
|
%: ;
|
Loading…
Reference in New Issue