Browse Source

bugfix: renaming some functions

JNI-44
Volker Birk 10 years ago
parent
commit
3ad820d8dd
  1. 7
      src/Makefile
  2. 2
      src/Makefile.conf
  3. 4
      src/org_pEp_jniadapter_AbstractEngine.cc

7
src/Makefile

@ -1,8 +1,9 @@
LIBRARY=libpEpJNI.a
SHARED=libpEpJNI.so
JAR=jniadapter.jar
include Makefile.conf
all: $(JAR) $(LIBRARY)
all: $(JAR) $(SHARED)
JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
org/pEp/jniadapter/AbstractEngine.java \
@ -39,6 +40,9 @@ org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o: %.o: %.cc %.h
$(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o throw_pEp_exception.o jniutils.o basic_api.o
ar -r $@ *.o
$(SHARED): $(LIBRARY)
g++ -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
yml2proc -y gen_java_exceptions.ysl2 $< -o $@
@ -67,6 +71,7 @@ clean:
rm -f $(JAR) $(LIBRARY)
rm -f *.o
rm -f *.class
rm -f *.xml *.xsl
rm -f org_pEp_jniadapter_*.h
rm -f org/pEp/jniadapter/*.class
rm -f org/pEp/jniadapter/pEp*.java

2
src/Makefile.conf

@ -1,2 +1,4 @@
CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(HOME)/include
CLASSPATH=.:$(HOME)/src/k-9/k9mail/src
LDFLAGS=-L$(HOME)/lib
SHARED=libpEpJNI.dylib

4
src/org_pEp_jniadapter_AbstractEngine.cc

@ -13,7 +13,7 @@ extern "C" {
using namespace pEp::JNIAdapter;
using namespace pEp::utility;
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_init(
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_init(
JNIEnv *env,
jobject me
)
@ -43,7 +43,7 @@ extern "C" {
env->SetLongField(me, handle, _session);
}
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_release(
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_release(
JNIEnv *env,
jobject me
)

Loading…
Cancel
Save