Browse Source

Fix testing,java - and use build using o files instead of lib.a *WORKARROUND*

JNI-88
Hussein Kasem 7 years ago
parent
commit
8e1deb894d
  1. 4
      src/Makefile
  2. 1
      src/Makefile.conf
  3. 1
      test/Testing.java

4
src/Makefile

@ -50,8 +50,8 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
ar -r $@ *.o
$(SHARED): $(LIBRARY)
$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine -lpEpAdapter *.o
$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine $(PEP_ADAPTER_OBJECT_LIB)/*.o *.o
#FIXME ^ use libpEpAdapter.a instad of the bunch of *.o
org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
yml2proc -y gen_java_exceptions.ysl2 $< -o $@

1
src/Makefile.conf

@ -1,3 +1,4 @@
CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include -fpermissive -DDISABLE_SYNC
LDFLAGS=-L$(HOME)/lib
SHARED=libpEpJNI.dylib
PEP_ADAPTER_OBJECT_LIB=$(HOMEI)/pEp/libpEpAdapter

1
test/Testing.java

@ -105,7 +105,6 @@ class Testing {
System.out.println("TEST DONE - FINISHED");
try {
e.startSync();
e.key_reset(null, null);
}
catch (pEpException ex) {

Loading…
Cancel
Save