Browse Source

Merge from Release_3.2 branch (sorry for the mess)

master v3.3.0-RC0
heck 2 years ago
parent
commit
d37c66f805
  1. 10
      Makefile.conf
  2. 4
      build.conf.example
  3. 1
      src/callback_dispatcher.hh

10
Makefile.conf

@ -26,7 +26,7 @@ TARGET=libpEpAdapter.a
# Build config
# Defaults
DEBUG=1
DEBUG?=debug
PREFIX?=$(HOME)
# Constants
@ -44,10 +44,10 @@ else ifneq (,$(findstring clang,$(CXX)))
CFLAGS+=-fcolor-diagnostics
endif
ifeq ($(DEBUG),1)
CXXFLAGS+=-g -O0
CFLAGS+=-g -O0
else
ifeq ($(DEBUG),release)
CXXFLAGS+=-DNDEBUG=1 -O3
CFLAGS+=-DNDEBUG=1 -O3
else
CXXFLAGS+=-g -O0
CFLAGS+=-g -O0
endif

4
build.conf.example

@ -6,8 +6,8 @@
######### C++ Compiler #########
# Should work with clang and g++
# CXX=g++
# DEBUG=1 # DEBUG Build (Default)
# DEBUG=0 # RELEASE Build
# DEBUG=debug # DEBUG Build (Default)
# DEBUG=release # RELEASE Build
############# DIRS #############
# PREFIX=$(HOME)/local

1
src/callback_dispatcher.hh

@ -4,6 +4,7 @@
#ifndef LIBPEPADAPTER_CALLBACK_DISPATCHER_HH
#define LIBPEPADAPTER_CALLBACK_DISPATCHER_HH
#include <stdexcept>
#include <vector>
#include <functional>
#include <mutex>

Loading…
Cancel
Save