diff options
| -rw-r--r-- | pjmedia/build/Makefile | 30 | ||||
| -rw-r--r-- | pjmedia/build/os-win32.mak | 13 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/codec.h | 4 | ||||
| -rw-r--r-- | pjsip/build/Makefile | 2 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_types.h | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua/pjsua_core.c | 6 |
7 files changed, 38 insertions, 21 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 3febac90..4394c7d2 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -12,7 +12,8 @@ export PJMEDIA_LIB:=../lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIB # export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include \ - $(CC_INC)../../pjlib-util/include + $(CC_INC)../../pjlib-util/include \ + $(CC_INC)../src/pjmedia/portaudio export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ @@ -27,18 +28,18 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ PA_DIR:=portaudio export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - codec.o errno.o g711.o jbuf.o mediamgr.o rtcp.o \ - rtp.o sdp.o sdp_cmp.o sdp_neg.o stream.o \ -# pasound.o \ -# $(PA_DIR)/pa_allocation.o \ -# $(PA_DIR)/pa_converters.o \ -# $(PA_DIR)/pa_cpuload.o \ -# $(PA_DIR)/pa_dither.o \ -# $(PA_DIR)/pa_front.o \ -# $(PA_DIR)/pa_process.o \ -# $(PA_DIR)/pa_skeleton.o \ -# $(PA_DIR)/pa_stream.o \ -# $(PA_DIR)/pa_trace.o + codec.o endpoint.o errno.o g711.o jbuf.o rtcp.o \ + rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o stream.o \ + pasound.o \ + $(PA_DIR)/pa_allocation.o \ + $(PA_DIR)/pa_converters.o \ + $(PA_DIR)/pa_cpuload.o \ + $(PA_DIR)/pa_dither.o \ + $(PA_DIR)/pa_front.o \ + $(PA_DIR)/pa_process.o \ + $(PA_DIR)/pa_skeleton.o \ + $(PA_DIR)/pa_stream.o \ + $(PA_DIR)/pa_trace.o export PJMEDIA_CFLAGS += $(_CFLAGS) @@ -59,7 +60,8 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT # # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. # -TARGETS := pjmedia pjmedia-test +TARGETS := pjmedia +#pjmedia-test all: $(TARGETS) diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak new file mode 100644 index 00000000..cb58993f --- /dev/null +++ b/pjmedia/build/os-win32.mak @@ -0,0 +1,13 @@ +# +# OS specific configuration for Win32 OS target. +# + +# +# PJMEDIA_OBJS specified here are object files to be included in PJMEDIA +# (the library) for this specific operating system. Object files common +# to all operating systems should go in Makefile instead. +# +export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ + $(PA_DIR)/pa_win_ds.o + +export OS_CFLAGS += -DPA_NO_ASIO diff --git a/pjmedia/include/pjmedia/codec.h b/pjmedia/include/pjmedia/codec.h index 75135d62..f10e9ab5 100644 --- a/pjmedia/include/pjmedia/codec.h +++ b/pjmedia/include/pjmedia/codec.h @@ -338,12 +338,12 @@ struct pjmedia_codec_factory /** * Codec manager maintains codec factory etc. */ -typedef struct pjmedia_codec_mgr +struct pjmedia_codec_mgr { pjmedia_codec_factory factory_list; unsigned codec_cnt; pjmedia_codec_info codecs[PJMEDIA_CODEC_MGR_MAX_CODECS]; -} pjmedia_codec_mgr; +}; diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 8170cd93..976ef8f8 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -54,7 +54,7 @@ export PJSIP_UA_CFLAGS += $(_CFLAGS) # export PJSUA_SRCDIR = ../src/pjsua export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - main.o pjsua_reg.o pjsua_core.o + main.o pjsua_reg.o pjsua_inv.o pjsua_core.o export PJSUA_CFLAGS += $(_CFLAGS) export PJSUA_LDFLAGS += $(_LDFLAGS) export PJSUA_EXE:=../bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) diff --git a/pjsip/include/pjsip/sip_types.h b/pjsip/include/pjsip/sip_types.h index a77f2550..8ea6c414 100644 --- a/pjsip/include/pjsip/sip_types.h +++ b/pjsip/include/pjsip/sip_types.h @@ -136,7 +136,7 @@ typedef struct pjsip_dialog pjsip_dialog; /** * Dialog state (sip_dialog.h). */ -enum pjsip_dialog_state pjsip_dialog_state; +typedef enum pjsip_dialog_state pjsip_dialog_state; /** * Transaction role. diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index d551ee70..fede7da6 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -1578,6 +1578,8 @@ static void inv_on_state_calling( pjsip_inv_session *inv, pjsip_event *e) } break; + default: + break; } } } diff --git a/pjsip/src/pjsua/pjsua_core.c b/pjsip/src/pjsua/pjsua_core.c index 7eb414bc..3bdf94ee 100644 --- a/pjsip/src/pjsua/pjsua_core.c +++ b/pjsip/src/pjsua/pjsua_core.c @@ -561,9 +561,9 @@ pj_status_t pjsua_start(void) /* With the user part. */ len = pj_snprintf(contact, sizeof(contact), "<sip:%.*s@%.*s:%d>", - sip_uri->user.slen, + (int)sip_uri->user.slen, sip_uri->user.ptr, - udp_transport->local_name.host.slen, + (int)udp_transport->local_name.host.slen, udp_transport->local_name.host.ptr, udp_transport->local_name.port); } else { @@ -572,7 +572,7 @@ pj_status_t pjsua_start(void) len = pj_snprintf(contact, sizeof(contact), "<sip:%.*s:%d>", - udp_transport->local_name.host.slen, + (int)udp_transport->local_name.host.slen, udp_transport->local_name.host.ptr, udp_transport->local_name.port); } |