Changeset 4600

Timestamp:

Sep 23, 2013 11:49:59 AM (11 years ago)

Author:

bennylp

Message:

More re #1519: fixed build errors and added svn ignore for output files in java and python dirs

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig

Files:

• java/Makefile (modified) (2 diffs)
• java/output (added)
• pjsua2.i (modified) (2 diffs)
• python (modified) (1 prop)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile

@@ -2 +2 @@
 
 OUT_DIR=output
-JAVA_SO=$(OUT_DIR)/libpjsua2.so
+LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
 
-JDK=/usr/lib/jvm/java-6-sun
+# Get JDK location
+ifeq ("$(JAVA_HOME)","")
+  # Get javac location to determine JDK location
+  JAVAC_PATH = $(shell which javac)
+  ifeq ("$(JAVAC_PATH)","")
+    $(error Cannot determine JDK location using 'which' command. Please define JAVA_HOME envvar)
+  endif
 
-all: $(JAVA_SO)
+  JAVAC_PATH := $(realpath $(JAVAC_PATH))
+  JAVA_BIN := $(dir $(JAVAC_PATH))
+  JAVA_HOME := $(patsubst %/bin/,%,$(JAVA_BIN))
+endif
 
-$(JAVA_SO): $(OUT_DIR)/pjsua2_wrap.o
-        gcc -shared -Wl,-soname,libpjsua2.so $(OUT_DIR)/pjsua2_wrap.o -o $(JAVA_SO) -lstdc++ $(APP_LDFLAGS)
+# OS specific
+ifeq ($(OS),Windows_NT)
+MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
+MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
+else
+MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua.so
+MY_JNI_LIB       = $(MY_PACKAGE_BIN)/libpjsua.so
+MY_JNI_CFLAGS    := -fPIC
+endif
+
+# Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe)
+MY_SWIG          = swig
+MY_JDK           = $(JAVA_HOME)
+MY_JAVA          = $(MY_JDK)/bin/java
+MY_JAVAC         = $(MY_JDK)/bin/javac
+MY_JNI_CFLAGS    := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \
+                   -I$(MY_JDK)/include/linux -I.
+
+# Build settings
+MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS)
+MY_LDFLAGS       = $(PJ_LDFLAGS) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
+
+all: $(LIBPJSUA2_SO)
+
+$(LIBPJSUA2_SO): $(OUT_DIR)/pjsua2_wrap.o
+        gcc -shared -Wl,-soname,libpjsua2.so $(OUT_DIR)/pjsua2_wrap.o -o $(LIBPJSUA2_SO) -lstdc++ $(MY_CFLAGS) $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.o: $(OUT_DIR)/pjsua2_wrap.cpp Makefile
-        gcc -c $(OUT_DIR)/pjsua2_wrap.cpp -fPIC -o $(OUT_DIR)/pjsua2_wrap.o  -I$(JDK)/include -I$(JDK)/include/linux $(APP_CFLAGS)
+        gcc -c $(OUT_DIR)/pjsua2_wrap.cpp -fPIC -o $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.cpp: ../pjsua2.i $(SRCS)
@@ -18 +51 @@
 
 clean distclean realclean:
-        rm -rf $(OUT_DIR)/pjsua2_wrap.cpp $(OUT_DIR)/pjsua2_wrap.o $(JAVA_SO) $(OUT_DIR)/*.java $(OUT_DIR)/*.class
+        rm -rf $(OUT_DIR)/pjsua2_wrap.cpp $(OUT_DIR)/pjsua2_wrap.o $(LIBPJSUA2_SO) $(OUT_DIR)/*.java $(OUT_DIR)/*.class
         ln -s ../test.java output/test.java

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/pjsua2.i

@@ -12 +12 @@
 #include "pjsua2/endpoint.hpp"
 using namespace std;
+using namespace pj;
 %}
 
@@ -42 +43 @@
 #define PJ_DECL(type)           type
 #define PJ_INLINE(type)         type
+#define PJ_DECL_DATA(type)      extern type
 
 //