Changeset 5735

Timestamp:

Feb 12, 2018 6:50:00 AM (6 years ago)

Author:

ming

Message:

Fixed #2086: Add C# binding using SWIG, and support for Xamarin

Location:

pjproject/trunk

Files:

• aconfigure (modified) (3 diffs)
• aconfigure.ac (modified) (2 diffs)
• build.mak.in (modified) (1 diff)
• pjsip-apps/src/swig/Makefile (modified) (2 diffs)
• pjsip-apps/src/swig/csharp (added)
• pjsip-apps/src/swig/csharp/Makefile (added)
• pjsip-apps/src/swig/csharp/sample.cs (added)
• pjsip-apps/src/swig/symbols.i (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -701 +701 @@
 ac_linux_poll
 ac_os_objs
+ac_target_arch
 EGREP
 GREP
@@ -5061 +5062 @@
 fi
 
+
 case $target in
     *android*)
         $as_echo "#define PJ_ANDROID 1" >>confdefs.h
 
+        ac_target_arch=$TARGET_ABI
         ;;
     *mingw* | *cygw* | *win32* | *w32* )
@@ -5077 +5080 @@
         $as_echo "#define PJ_DARWINOS 1" >>confdefs.h
 
+        ac_target_arch=$ARCH_VAL
         ;;
     *linux*)

pjproject/trunk/aconfigure.ac

@@ -147 +147 @@
 dnl Legacy macros
 dnl
+AC_SUBST(ac_target_arch)
 case $target in
     *android*)
         AC_DEFINE(PJ_ANDROID,1)
+        ac_target_arch=$TARGET_ABI
         ;;
     *mingw* | *cygw* | *win32* | *w32* )
@@ -158 +160 @@
     *darwin*)
         AC_DEFINE(PJ_DARWINOS,1)
+        ac_target_arch=$ARCH_VAL
         ;;
     *linux*)

pjproject/trunk/build.mak.in

@@ -8 +8 @@
 export HOST_NAME := unix
 export CC_NAME := gcc
+export TARGET_ARCH := @ac_target_arch@
 export TARGET_NAME := @target@
 export CROSS_COMPILE := @ac_cross_compile@

pjproject/trunk/pjsip-apps/src/swig/Makefile

@@ -2 +2 @@
 
 ifneq ($(findstring android,$(TARGET_NAME)),)
-  # no python for android
-  DIRS = java
+    # no python for android
+    DIRS = java csharp
 else
-  DIRS = python java
+    ifneq ($(findstring ios,$(TARGET_NAME)),)
+        DIRS = csharp
+    else
+        DIRS = python java
+    endif
 endif
 
@@ -29 +33 @@
         done
 
+csharp:
+        $(MAKE) $(MAKE_FLAGS) -C csharp $@
+
 symbols.i: symbols.lst
         @echo ** Warning **: file symbols.i is out of date. Run 'make symbol'.

pjproject/trunk/pjsip-apps/src/swig/symbols.i

@@ -176 +176 @@
 typedef enum pjsua_create_media_transport_flag {PJSUA_MED_TP_CLOSE_MEMBER = 1} pjsua_create_media_transport_flag;
 
-typedef enum pjsua_snd_dev_id {PJSUA_SND_DEFAULT_CAPTURE_DEV = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV, PJSUA_SND_DEFAULT_PLAYBACK_DEV = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV, PJSUA_SND_NO_DEV = PJMEDIA_AUD_INVALID_DEV, PJSUA_SND_NULL_DEV = -99} pjsua_snd_dev_id;
+typedef enum pjsua_snd_dev_id {PJSUA_SND_DEFAULT_CAPTURE_DEV = -1, PJSUA_SND_DEFAULT_PLAYBACK_DEV = -2, PJSUA_SND_NO_DEV = -3, PJSUA_SND_NULL_DEV = -99} pjsua_snd_dev_id;
 
 typedef enum pjsua_snd_dev_mode {PJSUA_SND_DEV_SPEAKER_ONLY = 1, PJSUA_SND_DEV_NO_IMMEDIATE_OPEN = 2} pjsua_snd_dev_mode;