Changeset 171

Timestamp:

Feb 9, 2006 2:38:30 PM (18 years ago)

Author:

bennylp

Message:

Failed attempt to build pjmedia with DirectSound? on Linux

Location:

pjproject/trunk

Files:

• pjmedia/build/Makefile (modified) (3 diffs)
• pjmedia/build/os-win32.mak (added)
• pjmedia/include/pjmedia/codec.h (modified) (1 diff)
• pjsip/build/Makefile (modified) (1 diff)
• pjsip/include/pjsip/sip_types.h (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsip/src/pjsua/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -13 +13 @@
 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)
@@ -28 +29 @@
 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)
@@ -60 +61 @@
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-test
+TARGETS := pjmedia 
+#pjmedia-test
 
 all: $(TARGETS)

pjproject/trunk/pjmedia/include/pjmedia/codec.h

@@ -339 +339 @@
  * 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;
+};
 
 

pjproject/trunk/pjsip/build/Makefile

@@ -55 +55 @@
 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)

pjproject/trunk/pjsip/include/pjsip/sip_types.h

@@ -137 +137 @@
  * Dialog state (sip_dialog.h).
  */
-enum pjsip_dialog_state pjsip_dialog_state;
+typedef enum pjsip_dialog_state pjsip_dialog_state;
 
 /**

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1579 +1579 @@
             break;
 
+        default:
+            break;
         }
     }

pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

@@ -562 +562 @@
             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);
@@ -573 +573 @@
             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);