From cdc45c4601833472cd2c653177b59d4467169642 Mon Sep 17 00:00:00 2001 From: yhirose Date: Wed, 26 Jun 2019 15:09:34 -0400 Subject: [PATCH] Changed to use CXX and CXXFLAGS in Makefile --- example/Makefile | 14 +++++++------- test/Makefile | 8 +++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/example/Makefile b/example/Makefile index 443587a..575f062 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,25 +1,25 @@ -CC = clang++ -CFLAGS = -std=c++14 -I.. -Wall -Wextra -lpthread +#CXX = clang++ +CXXFLAGS = -std=c++14 -I.. -Wall -Wextra -lpthread OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz all: server client hello simplesvr benchmark server : server.cc ../httplib.h Makefile - $(CC) -o server $(CFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + $(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) client : client.cc ../httplib.h Makefile - $(CC) -o client $(CFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + $(CXX) -o client $(CXXFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) hello : hello.cc ../httplib.h Makefile - $(CC) -o hello $(CFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + $(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) simplesvr : simplesvr.cc ../httplib.h Makefile - $(CC) -o simplesvr $(CFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + $(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) benchmark : benchmark.cc ../httplib.h Makefile - $(CC) -o benchmark $(CFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + $(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) pem: openssl genrsa 2048 > key.pem diff --git a/test/Makefile b/test/Makefile index 8a1b572..f8a59d6 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,8 +1,6 @@ -CC = clang++ -#CC = g++ - -CFLAGS = -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits +#CXX = clang++ +CXXFLAGS = -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz @@ -10,7 +8,7 @@ all : test ./test test : test.cc ../httplib.h Makefile cert.pem - $(CC) -o test $(CFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -lpthread + $(CXX) -o test $(CXXFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -lpthread cert.pem: openssl genrsa 2048 > key.pem