Browse Source

Merge branch 'Release_2.1'

# Conflicts:
#	Makefile.conf
#	test/Makefile
pull/8/head
heck 3 months ago
parent
commit
5008848ba4
3 changed files with 5 additions and 0 deletions
  1. +2
    -0
      Makefile.conf
  2. +2
    -0
      test/Makefile
  3. +1
    -0
      test/test_message_cache.cc

+ 2
- 0
Makefile.conf View File

@ -12,6 +12,8 @@ TARGET=libpEpAdapter.a
DEBUG=1
PREFIX?=$(HOME)
CXXFLAGS+=-std=c++11 -fPIC
# Overrides
-include $(HERE)local.conf


+ 2
- 0
test/Makefile View File

@ -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


+ 1
- 0
test/test_message_cache.cc View File

@ -5,6 +5,7 @@
#include <iostream>
#include <cassert>
#include <cstring>
#include <sys/param.h>
#include <unistd.h>


Loading…
Cancel
Save