Changeset 4549 for pjproject/branches/projects/jni/pjsip-apps/src/jni/Makefile

Timestamp:

Jun 29, 2013 1:14:27 AM (11 years ago)

Author:

nanang

Message:

Work on JNI project:

• Only use single SWIG C++ wrapper.
• Initial work on pjsua_callback: added parser and auto proxy generation.
• Updated SWIG typemaps: SWIG director, input output, array of pointer, etc.

Location:

pjproject/branches/projects/jni/pjsip-apps/src/jni

Files:

• . (modified) (1 prop)
• Makefile (modified) (4 diffs)

pjproject/branches/projects/jni/pjsip-apps/src/jni/Makefile

@@ -13 +13 @@
 MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
 
-# Choose C or C++ SWIG wrapper target, just for dev purpose.
-# Note that C target doesn't support callback, and C++ target doesn't support nested class/struct.
-SWIG_CPP_TARGET = 0
-
 # Build settings
 MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS)
-MY_LDFLAGS       = $(PJ_LDFLAGS) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS)
+MY_LDFLAGS       = $(PJ_LDFLAGS) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
 
 # Output/intermediate path settings
@@ -25 +21 @@
 MY_OUT_DIR       = output
 MY_SWIG_IF       = $(MY_OUT_DIR)/pjsua.i
-MY_SWIG_FLAG     = -Wall
+MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR) # -Wall
 MY_SWIG_WRAPPER  = $(MY_OUT_DIR)/pjsua_wrap
-MY_CALLBACKS     = callbacks
 MY_PACKAGE_SRC   = $(MY_OUT_DIR)/src/$(subst .,/,$(MY_PACKAGE))
 MY_PACKAGE_BIN   = $(MY_OUT_DIR)/bin
 MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
-
-# Adjust setting for C/C++
-ifeq ($(SWIG_CPP_TARGET),1)
-MY_CC            = $(PJ_CXX)
-MY_LDFLAGS      += -static-libstdc++
-MY_SWIG_FLAG    += -c++ -debug-tmsearch -debug-tmused
-else
-MY_CC            = $(PJ_CC)
-MY_SWIG_FLAG    += -debug-tmsearch -debug-tmused
-endif
 
 all: $(MY_JNI_LIB) java
@@ -47 +32 @@
         rm -rf $(MY_OUT_DIR)
 
+$(MY_SWIG_IF).tmp: swig_gen.py
+        @mkdir -p $(MY_OUT_DIR)
+        python swig_gen.py > $(MY_SWIG_IF).tmp
+
 $(MY_SWIG_IF): header.i $(MY_SWIG_IF).tmp
         cat header.i > $(MY_SWIG_IF)
         cat $(MY_SWIG_IF).tmp >> $(MY_SWIG_IF)
 
-$(MY_SWIG_IF).tmp: swig_gen.py
-        @mkdir -p $(MY_OUT_DIR)
-        python swig_gen.py > $(MY_SWIG_IF).tmp
-
-$(MY_SWIG_WRAPPER).c: $(MY_SWIG_IF) $(MY_CALLBACKS).h $(MY_CALLBACKS).cpp $(MY_CALLBACKS).i
-        # Cleanup java outdir first, to remove any old/deprecated java files
+$(MY_SWIG_WRAPPER).c: $(MY_SWIG_IF) callbacks.i my_typemaps.i
+        @# Cleanup java outdir first, to remove any old/deprecated java files
         rm -rf $(MY_PACKAGE_SRC)
         @mkdir -p $(MY_PACKAGE_SRC)
         $(MY_SWIG) $(MY_SWIG_FLAG) -o $(MY_SWIG_WRAPPER).c -package $(MY_PACKAGE) \
-                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF) > $(MY_SWIG_WRAPPER)-tm.txt
-        $(MY_SWIG) -c++ $(MY_SWIG_FLAG) -o $(MY_SWIG_WRAPPER)2.c -package $(MY_PACKAGE) \
-                -outdir $(MY_PACKAGE_SRC) -java $(MY_CALLBACKS).i > $(MY_SWIG_WRAPPER)2-tm.txt
+                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF) > $(MY_SWIG_WRAPPER)-tm.log
 
-$(MY_SWIG_WRAPPER).o: $(MY_SWIG_WRAPPER).c
-        $(MY_CC) -c $(MY_CFLAGS) $(MY_SWIG_WRAPPER).c -o $(MY_SWIG_WRAPPER).o
-        $(PJ_CXX) -c $(MY_CFLAGS) $(MY_SWIG_WRAPPER)2.c -o $(MY_SWIG_WRAPPER)2.o
-        
-$(MY_OUT_DIR)/$(MY_CALLBACKS).o: $(MY_CALLBACKS).cpp $(MY_CALLBACKS).h
-        $(PJ_CXX) -c $(MY_CFLAGS) $(MY_CALLBACKS).cpp -o $(MY_OUT_DIR)/$(MY_CALLBACKS).o
-
-$(MY_JNI_LIB): $(MY_SWIG_WRAPPER).o $(MY_OUT_DIR)/$(MY_CALLBACKS).o
+$(MY_JNI_LIB): $(MY_SWIG_WRAPPER).c
         @mkdir -p $(MY_PACKAGE_BIN)
-        $(PJ_CXX) -shared -o $(MY_JNI_LIB) $(MY_SWIG_WRAPPER).o $(MY_OUT_DIR)/$(MY_CALLBACKS).o \
-                $(MY_SWIG_WRAPPER)2.o $(MY_LDFLAGS) -static-libstdc++
+        $(PJ_CXX) -shared -o $(MY_JNI_LIB) $(MY_SWIG_WRAPPER).c $(MY_OUT_DIR)/callbacks.c \
+                $(MY_CFLAGS) $(MY_LDFLAGS)
 
 java: hello.java
@@ -82 +58 @@
 
 test: $(MY_PACKAGE_BIN)/hello.class
-        # Need to specify classpath and library path, alternatively, they can be set via
-        # CLASSPATH and java.library.path env settings
+        @# Need to specify classpath and library path, alternatively, they can be set via
+        @# CLASSPATH and java.library.path env settings
         $(MY_JAVA) -cp $(MY_PACKAGE_BIN) -Djava.library.path="$(MY_PACKAGE_BIN)" hello