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

Timestamp:

Oct 16, 2013 9:19:08 AM (11 years ago)

Author:

nanang

Message:

Re #1519:

• allow build on mingw32
• fixed tests

File:

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

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

@@ -2 +2 @@
 
 OUT_DIR=output
+ifeq ($(OS),Windows_NT)
+LIBPJSUA2_SO=$(OUT_DIR)/pjsua2.dll
+else
 LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
+endif
 
 # Get JDK location
@@ -20 +24 @@
 ifeq ($(OS),Windows_NT)
 MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
-MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
+MY_JNI_LIB       = $(OUT_DIR)/pjsua2.dll
 else
-MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua.so
-MY_JNI_LIB       = $(MY_PACKAGE_BIN)/libpjsua.so
+MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua2.so
+MY_JNI_LIB       = $(OUT_DIR)/libpjsua2.so
 MY_JNI_CFLAGS    := -fPIC
 endif
@@ -37 +41 @@
 # Build settings
 MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS)
-MY_LDFLAGS       = $(PJ_LDFLAGS) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
+MY_LDFLAGS       = $(PJ_LDFLAGS) -lpjsua2-$(TARGET_NAME) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
 
-all: $(LIBPJSUA2_SO)
+all: $(LIBPJSUA2_SO) java
 
 $(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)
+        g++ -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o $(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 $(MY_CFLAGS) $(MY_LDFLAGS)
+        g++ -c $(OUT_DIR)/pjsua2_wrap.cpp -o $(OUT_DIR)/pjsua2_wrap.o $(MY_CFLAGS) $(MY_LDFLAGS)
 
 $(OUT_DIR)/pjsua2_wrap.cpp: ../pjsua2.i $(SRCS)
@@ -52 +56 @@
 clean distclean realclean:
         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
+
+java:
+        $(MY_JAVAC) -d $(OUT_DIR) $(OUT_DIR)/*.java
+        $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" test.java
+
+test:
+        @# 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