From 629e55f97d605473ec7c589da9a3500c5958d3f9 Mon Sep 17 00:00:00 2001 From: cpq Date: Mon, 7 Dec 2020 01:00:35 +0000 Subject: [PATCH] Tuning test --- .travis.yml | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b99dbb23..17f36c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ addons: apt: packages: libmbedtls-dev homebrew: - packages: mbedtls + packages: mbedtls jq diff --git a/Makefile b/Makefile index 6f9c28a7..0701778b 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,12 @@ EXAMPLE_TARGET ?= example .PHONY: $(EXAMPLES) ifeq "$(SSL)" "MBEDTLS" -MBEDTLSDIR ?= /usr/local/Cellar/mbedtls/2.23.0 -CFLAGS += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLSDIR)/include +MBEDTLSDIR ?= $(shell "$(brew --cellar mbedtls)/$(brew info mbedtls --json | jq -j .[0].installed[0].version)") +CFLAGS += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLSDIR)/include -I/usr/include/mbedtls LDFLAGS ?= -L$(MBEDTLSDIR)/lib -lmbedtls -lmbedcrypto -lmbedx509 endif ifeq "$(SSL)" "OPENSSL" -OPENSSLDIR ?= /usr/local/Cellar/openssl@1.1/1.1.1g +OPENSSLDIR ?= $(shell "$(brew --cellar openssl)/$(brew info openssl --json | jq -j .[0].installed[0].version)") CFLAGS += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSLDIR)/include LDFLAGS ?= -L$(OPENSSLDIR)/lib -lssl -lcrypto endif