From 90a291214c37c550d2e9fed0e35f0aac22a3bcc0 Mon Sep 17 00:00:00 2001 From: yhirose <yuji.hirose.bug@gmail.com> Date: Mon, 15 Nov 2021 23:06:31 -0500 Subject: [PATCH] Update Makefile --- example/Makefile | 13 ++++++++----- test/Makefile | 10 +++++++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/example/Makefile b/example/Makefile index 931db09..f4c86eb 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,14 +1,17 @@ - #CXX = clang++ CXXFLAGS = -std=c++11 -I.. -Wall -Wextra -pthread -OPENSSL_DIR = /usr/local/opt/openssl +PREFIX = /usr/local +#PREFIX = $(shell brew --prefix) + +OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1 +#OPENSSL_DIR = $(PREFIX)/opt/openssl@3 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz -BROTLI_DIR = /usr/local/opt/brotli -# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon-static -lbrotlienc-static -lbrotlidec-static +BROTLI_DIR = $(PREFIX)/opt/brotli +BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark @@ -47,4 +50,4 @@ pem: openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem clean: - rm server client hello simplecli simplesvr upload redirect ssesvr sselci benchmark *.pem + rm server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark *.pem diff --git a/test/Makefile b/test/Makefile index 6b5db6d..52139e5 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,12 +1,16 @@ #CXX = clang++ CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion #-fsanitize=address -OPENSSL_DIR = /usr/local/opt/openssl@1.1 +PREFIX = /usr/local +#PREFIX = $(shell brew --prefix) + +OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1 +#OPENSSL_DIR = $(PREFIX)/opt/openssl@3 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz -BROTLI_DIR = /usr/local/opt/brotli +BROTLI_DIR = $(PREFIX)/opt/brotli BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread @@ -64,4 +68,4 @@ cert.pem: #c_rehash . clean: - rm -f test test_proxy server_fuzzer pem *.0 *.o *.1 *.srl httplib.h httplib.cc + rm -f test test_split test_proxy server_fuzzer pem *.0 *.o *.1 *.srl httplib.h httplib.cc