Fix up Makefiles, and fix include issues compiling with gcc

2016-09-01 18:26:19 -07:00
parent b1a3ab1804
commit 7df55e17e9
5 changed files with 13 additions and 13 deletions
@@ -16,6 +16,7 @@
 #include "utils/Likely.h"

 #include <cstddef>
+#include <cstring>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
@@ -21,10 +21,10 @@ GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest

 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB)
-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
 CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 %: %.cpp
 	$(CXX) $(FLAGS) -lgtest -lgtest_main $^ -o $@$(EXT)