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

Timestamp:

Dec 13, 2013 9:07:53 AM (11 years ago)

Author:

nanang

Message:

Re #1716: Initial implementation of new Android app based on pjsua2+SWIG API.

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile (modified) (5 diffs)

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

@@ -1 +1 @@
 include ../../../../build.mak
 
-ifneq ($(findstring "$(TARGET_NAME)","darwin"),"")
+ifneq ($(findstring android,$(TARGET_NAME)),)
+ OS=android
+else
+ ifneq ($(findstring darwin,$(TARGET_NAME)),)
   OS=darwin
+ endif
 endif
 
 OUT_DIR=output
 ifeq ($(OS),Windows_NT)
-LIBPJSUA2_SO=$(OUT_DIR)/pjsua2.dll
+  LIBPJSUA2_SO=$(OUT_DIR)/pjsua2.dll
 else
   ifeq ($(OS),darwin)
     LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.jnilib
   else
-    LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
+    ifeq ($(OS),android)
+      LIBPJSUA2_SO=android/libs/armeabi/libpjsua2.so
+    else
+      LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
+    endif
   endif
 endif
@@ -33 +41 @@
     JAVA_BIN := $(JAVA_HOME)
   endif
-  #$(error $(JAVA_BIN))
 endif
 
 # OS specific
 ifeq ($(OS),Windows_NT)
-  MY_JNI_LDFLAGS         = -L$(MY_JDK)/lib -Wl,--kill-at
-  MY_JNI_LIB       = $(OUT_DIR)/pjsua2.dll
+  MY_JNI_LDFLAGS        = -L$(MY_JDK)/lib -Wl,--kill-at
 else
-  MY_JNI_LDFLAGS         = -L$(MY_JDK)/lib
-  ifneq ($(OS),darwin)
-    MY_JNI_LDFLAGS := $(MY_JNI_LDFLAGS) -Wl,-soname,pjsua2.so
+  MY_JNI_CFLAGS         = -fPIC
+  MY_JNI_LDFLAGS        = -L$(MY_JDK)/lib
+  ifeq ($(OS),darwin)
+    MY_JNI_LDFLAGS      := $(MY_JNI_LDFLAGS) -Wl,-soname,pjsua2.so
   endif
-  MY_JNI_LIB       = $(OUT_DIR)/libpjsua2.so
-  MY_JNI_CFLAGS  := -fPIC $(MY_JNI_CFLAGS)
+  ifeq ($(OS),android)
+    MY_JNI_CFLAGS       := $(MY_JNI_CFLAGS) -D__ANDROID__
+  endif
 endif
 
@@ -60 +68 @@
 endif
 MY_JNI_CFLAGS    := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \
-                   -I$(MY_JDK)/include/linux -I.
+                    -I$(MY_JDK)/include/linux -I.
 
 # Build settings
 MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS)
-MY_LDFLAGS       = $(PJ_LDFLAGS) -lpjsua2-$(TARGET_NAME) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
+MY_LDFLAGS       = $(PJ_LDFLAGS) -lpjsua2-$(TARGET_NAME) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS)
+MY_PACKAGE_NAME  = org.pjsip.pjsua2
+ifeq ($(OS),android)
+  MY_PACKAGE_PATH  = android/src/$(subst .,/,$(MY_PACKAGE_NAME))
+else
+  MY_PACKAGE_PATH  = $(OUT_DIR)/$(subst .,/,$(MY_PACKAGE_NAME))
+endif
 
 .PHONY: all java install uninstall
@@ -71 +85 @@
 
 $(LIBPJSUA2_SO): $(OUT_DIR)/pjsua2_wrap.o
-        g++ -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
+        $(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.o: $(OUT_DIR)/pjsua2_wrap.cpp Makefile
-        g++ -c $(OUT_DIR)/pjsua2_wrap.cpp -o $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
+        $(PJ_CXX) -c $(OUT_DIR)/pjsua2_wrap.cpp -o $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.cpp: ../pjsua2.i ../symbols.i $(SRCS)
-        swig $(SWIG_FLAGS) -java  -o $(OUT_DIR)/pjsua2_wrap.cpp ../pjsua2.i
+        mkdir -p $(MY_PACKAGE_PATH)
+        swig $(SWIG_FLAGS) -java  -package $(MY_PACKAGE_NAME) -outdir $(MY_PACKAGE_PATH) -o $(OUT_DIR)/pjsua2_wrap.cpp ../pjsua2.i
 
 clean distclean realclean:
-        rm -rf $(OUT_DIR)/pjsua2_wrap.cpp $(OUT_DIR)/pjsua2_wrap.o $(LIBPJSUA2_SO) $(OUT_DIR)/*.java $(OUT_DIR)/*.class
+        rm -rf $(LIBPJSUA2_SO) $(OUT_DIR)/* $(MY_PACKAGE_PATH)/*.java $(MY_PACKAGE_PATH)/*.class
 
-java: output/Error.class output/test.class
+java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class
 
-output/Error.class: output/Error.java
-        $(MY_JAVAC) -d $(OUT_DIR) $(OUT_DIR)/*.java
+$(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java
+        $(MY_JAVAC) -d $(OUT_DIR) $(MY_PACKAGE_PATH)/*.java
 
-output/test.class: test.java
+$(MY_PACKAGE_PATH)/test.class: test.java
         $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" test.java
 
@@ -93 +108 @@
         @# Need to specify classpath and library path, alternatively, they can be set via
         @# CLASSPATH and java.library.path env settings
-        $(MY_JAVA) -cp $(OUT_DIR) -Djava.library.path="$(OUT_DIR)" test
+        $(MY_JAVA) -cp "$(OUT_DIR);$(MY_PACKAGE_PATH)" -Djava.library.path="$(OUT_DIR)" test
 
 install: