arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

emulation on host: Make non essential ARDUINO LIBS optional. (#5771)

Browse Source 
This patch splits ARDUINO_LIBS into two variables. The second variable is called OPT_ARDUINO_LIBS and can be overridden by the caller as it uses the ?= assignment operator. Additionally it unifies and simplifies collecting the files in common/ by using the addprefix macro. All changes should be 100% backwards compatible.
This commit is contained in:
Clemens Kirchgatterer 2019-02-16 22:50:27 +01:00 committed by david gauchard
parent 2be374cc6c
commit 9f9c661d99
1 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/host/Makefile
View File

@ -216,8 +216,7 @@ ARDUINO_LIBS := \
Updater.cpp \ Updater.cpp \
base64.cpp \ base64.cpp \
) \ ) \
$(addprefix ../../libraries/,\ $(addprefix ../../libraries/ESP8266WiFi/src/,\
$(addprefix ESP8266WiFi/src/,\
ESP8266WiFi.cpp \ ESP8266WiFi.cpp \
ESP8266WiFiAP.cpp \ ESP8266WiFiAP.cpp \
ESP8266WiFiGeneric.cpp \ ESP8266WiFiGeneric.cpp \
@ -232,41 +231,46 @@ ARDUINO_LIBS := \
BearSSLHelpers.cpp \ BearSSLHelpers.cpp \
CertStoreBearSSL.cpp \ CertStoreBearSSL.cpp \
) \ ) \
OPT_ARDUINO_LIBS ?= $(addprefix ../../libraries/,\
$(addprefix ESP8266WebServer/src/,\ $(addprefix ESP8266WebServer/src/,\
ESP8266WebServer.cpp \ ESP8266WebServer.cpp \
Parsing.cpp \ Parsing.cpp \
detail/mimetable.cpp \ detail/mimetable.cpp \
) \ ) \
ESP8266mDNS/src/LEAmDNS.cpp \ $(addprefix ESP8266mDNS/src/,\
ESP8266mDNS/src/LEAmDNS_Control.cpp \ LEAmDNS.cpp \
ESP8266mDNS/src/LEAmDNS_Helpers.cpp \ LEAmDNS_Control.cpp \
ESP8266mDNS/src/LEAmDNS_Structs.cpp \ LEAmDNS_Helpers.cpp \
ESP8266mDNS/src/LEAmDNS_Transfer.cpp \ LEAmDNS_Structs.cpp \
ESP8266mDNS/src/ESP8266mDNS.cpp \ LEAmDNS_Transfer.cpp \
ESP8266mDNS.cpp \
) \
ArduinoOTA/ArduinoOTA.cpp \ ArduinoOTA/ArduinoOTA.cpp \
DNSServer/src/DNSServer.cpp \ DNSServer/src/DNSServer.cpp \
ESP8266AVRISP/src/ESP8266AVRISP.cpp \ ESP8266AVRISP/src/ESP8266AVRISP.cpp \
ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \ ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \
) \ ) \
MOCK_ARDUINO_LIBS := \ MOCK_ARDUINO_LIBS := $(addprefix common/,\
common/ClientContextSocket.cpp \ ClientContextSocket.cpp \
common/ClientContextTools.cpp \ ClientContextTools.cpp \
common/MockWiFiServerSocket.cpp \ MockWiFiServerSocket.cpp \
common/MockWiFiServer.cpp \ MockWiFiServer.cpp \
common/UdpContextSocket.cpp \ UdpContextSocket.cpp \
common/HostWiring.cpp \ HostWiring.cpp \
common/MockEsp.cpp \ MockEsp.cpp \
common/MockEEPROM.cpp \ MockEEPROM.cpp \
common/MockSPI.cpp \ MockSPI.cpp \
) \
CPP_SOURCES_CORE_EMU = \ CPP_SOURCES_CORE_EMU = \
$(MOCK_CPP_FILES_EMU) \ $(MOCK_CPP_FILES_EMU) \
$(CORE_CPP_FILES) \ $(CORE_CPP_FILES) \
$(MOCK_ARDUINO_LIBS) \ $(MOCK_ARDUINO_LIBS) \
$(OPT_ARDUINO_LIBS) \
$(ARDUINO_LIBS) \ $(ARDUINO_LIBS) \
LIBSSLFILE = ../../tools/sdk/ssl/bearssl/build$(N32)/libbearssl.a LIBSSLFILE = ../../tools/sdk/ssl/bearssl/build$(N32)/libbearssl.a
ifeq (,$(wildcard $(LIBSSLFILE))) ifeq (,$(wildcard $(LIBSSLFILE)))
LIBSSL = LIBSSL =
@ -340,3 +344,4 @@ help:
@echo "" @echo ""
@sed -rne 's,([^: \t]*):[^=#]*#[\t ]*(.*),\1 - \2,p' $(MAKEFILE) @sed -rne 's,([^: \t]*):[^=#]*#[\t ]*(.*),\1 - \2,p' $(MAKEFILE)
@echo "" @echo ""