Browse Source

adding "pEp/" to include paths

android-1.0.101
Volker Birk 5 years ago
parent
commit
76adb8c6c1
8 changed files with 16 additions and 16 deletions
  1. +1
    -1
      src/Makefile
  2. +1
    -1
      src/Makefile.conf
  3. +3
    -3
      src/basic_api.cc
  4. +3
    -3
      src/gen_cpp_Engine.ysl2
  5. +1
    -1
      src/gen_cpp_Message.ysl2
  6. +1
    -1
      src/gen_throw_pEp_exception.ysl2
  7. +3
    -3
      src/jniutils.hh
  8. +3
    -3
      src/org_pEp_jniadapter_AbstractEngine.cc

+ 1
- 1
src/Makefile View File

@ -46,7 +46,7 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
ar -r $@ *.o
$(SHARED): $(LIBRARY)
c++ -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
yml2proc -y gen_java_exceptions.ysl2 $< -o $@


+ 1
- 1
src/Makefile.conf View File

@ -1,3 +1,3 @@
CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(HOME)/include -fpermissive
CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include -fpermissive
LDFLAGS=-L$(HOME)/lib
SHARED=libpEpJNI.dylib

+ 3
- 3
src/basic_api.cc View File

@ -1,6 +1,6 @@
#include <keymanagement.h>
#include <blacklist.h>
#include <sync.h>
#include <pEp/keymanagement.h>
#include <pEp/blacklist.h>
#include <pEp/sync.h>
#ifndef ANDROID
#include <string.h>


+ 3
- 3
src/gen_cpp_Engine.ysl2 View File

@ -10,9 +10,9 @@ tstylesheet {
template "interface" document("org_pEp_jniadapter_{@name}.cc", "text")
||
#include <assert.h>
#include <message_api.h>
#include <blacklist.h>
#include <openpgp_compat.h>
#include <pEp/message_api.h>
#include <pEp/blacklist.h>
#include <pEp/openpgp_compat.h>
#include "org_pEp_jniadapter_«@name».h"
#include "throw_pEp_exception.hh"
#include "jniutils.hh"


+ 1
- 1
src/gen_cpp_Message.ysl2 View File

@ -16,7 +16,7 @@ tstylesheet {
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
#include <«@name».h>
#include <pEp/«@name».h>
#include "jniutils.hh"
#include "org_pEp_jniadapter_«$jname».h"


+ 1
- 1
src/gen_throw_pEp_exception.ysl2 View File

@ -24,7 +24,7 @@ tstylesheet {
template "namespace"
||
#include <assert.h>
#include <pEpEngine.h>
#include <pEp/pEpEngine.h>
#include "throw_pEp_exception.hh"
namespace pEp {


+ 3
- 3
src/jniutils.hh View File

@ -4,9 +4,9 @@
#include <pthread.h>
#include <errno.h>
#include <jni.h>
#include <stringpair.h>
#include <identity_list.h>
#include <bloblist.h>
#include <pEp/stringpair.h>
#include <pEp/identity_list.h>
#include <pEp/bloblist.h>
#if 0 // Enable if log needed
#include <android/log.h>


+ 3
- 3
src/org_pEp_jniadapter_AbstractEngine.cc View File

@ -4,9 +4,9 @@
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <keymanagement.h>
#include <message_api.h>
#include <sync.h>
#include <pEp/keymanagement.h>
#include <pEp/message_api.h>
#include <pEp/sync.h>
#include "throw_pEp_exception.hh"
#include "jniutils.hh"


Loading…
Cancel
Save