Browse Source

C++11 is the standard to be used for all adapters (acc. to Volker)

JNI-88
heck 6 years ago
parent
commit
d07bef3cad
  1. 4
      Makefile.conf
  2. 2
      android/jni/Android.mk

4
Makefile.conf

@ -24,9 +24,9 @@ LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
######### C++ ######### ######### C++ #########
ifeq ($(BUILD_FOR),Linux) ifeq ($(BUILD_FOR),Linux)
CXX=g++ -std=c++14 CXX=g++ -std=c++11
else ifeq ($(BUILD_FOR),Darwin) else ifeq ($(BUILD_FOR),Darwin)
CXX=clang -std=c++14 CXX=clang -std=c++11
endif endif
ifeq ($(BUILD_FOR),Linux) ifeq ($(BUILD_FOR),Linux)

2
android/jni/Android.mk

@ -45,7 +45,7 @@ LOCAL_MODULE := pEpJNI
LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp
LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequoia_openpgp_ffi LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequoia_openpgp_ffi
LOCAL_CPP_FEATURES += exceptions LOCAL_CPP_FEATURES += exceptions
LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld LOCAL_CPPFLAGS += -std=c++11 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
../../src/foundation_pEp_jniadapter_AbstractEngine.cc \ ../../src/foundation_pEp_jniadapter_AbstractEngine.cc \
../../src/foundation_pEp_jniadapter_Engine.cc \ ../../src/foundation_pEp_jniadapter_Engine.cc \

Loading…
Cancel
Save