Merge branch 'Release_2.1'

# Conflicts: # Makefile.conf # test/Makefile
4 years ago · 5008848ba4
3 changed files with 5 additions and 0 deletions
--- a/Makefile.conf
+++ b/Makefile.conf
@ -12,6 +12,8 @@ TARGET=libpEpAdapter.a
 DEBUG=1
 PREFIX?=$(HOME)

+CXXFLAGS+=-std=c++11 -fPIC
+
 # Overrides
 -include $(HERE)local.conf

--- a/test/Makefile
+++ b/test/Makefile
@ -2,6 +2,8 @@ include ../Makefile.conf

 LDFLAGS:=-L../src $(LDFLAGS)
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
+LDFLAGS=-L../src $(ENGINE_LIB)
+LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter -lpthread
 CXXFLAGS:=-I../src -DENGINE_TEST=$(ENGINE_TEST) $(CXXFLAGS)

 # Test
--- a/test/test_message_cache.cc
+++ b/test/test_message_cache.cc
@ -5,6 +5,7 @@

 #include <iostream>
 #include <cassert>
+#include <cstring>
 #include <sys/param.h>
 #include <unistd.h>