From cd283c8825c9a94400f27735acb1c9385e90ffc8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 19 Jul 2011 03:42:28 +0000 Subject: Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn". git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/build/Makefile | 5 +- pjsip/build/pjsip.dsw | 152 --- pjsip/build/pjsip_core.dsp | 385 ------ pjsip/build/pjsip_simple.dsp | 186 --- pjsip/build/pjsip_test.dsp | 184 --- pjsip/build/pjsip_ua.dsp | 148 --- pjsip/build/pjsua_lib.dsp | 128 -- pjsip/build/pjsua_lib.vcproj | 484 ++++---- pjsip/include/pjsua-lib/pjsua.h | 755 +++++++++++- pjsip/include/pjsua-lib/pjsua_internal.h | 160 ++- pjsip/src/pjsip-ua/sip_100rel.c | 1 + pjsip/src/pjsip/sip_ua_layer.c | 4 + pjsip/src/pjsua-lib/pjsua_acc.c | 3 +- pjsip/src/pjsua-lib/pjsua_call.c | 1326 ++++++-------------- pjsip/src/pjsua-lib/pjsua_core.c | 60 +- pjsip/src/pjsua-lib/pjsua_dump.c | 944 +++++++++++++++ pjsip/src/pjsua-lib/pjsua_media.c | 1935 ++++++++++++++++++------------ pjsip/src/pjsua-lib/pjsua_vid.c | 1648 +++++++++++++++++++++++++ 18 files changed, 5224 insertions(+), 3284 deletions(-) delete mode 100644 pjsip/build/pjsip.dsw delete mode 100644 pjsip/build/pjsip_core.dsp delete mode 100644 pjsip/build/pjsip_simple.dsp delete mode 100644 pjsip/build/pjsip_test.dsp delete mode 100644 pjsip/build/pjsip_ua.dsp delete mode 100644 pjsip/build/pjsua_lib.dsp create mode 100644 pjsip/src/pjsua-lib/pjsua_dump.c create mode 100644 pjsip/src/pjsua-lib/pjsua_vid.c (limited to 'pjsip') diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 6466c57a..247ee7f4 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -75,8 +75,9 @@ export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) export PJSUA_LIB_SRCDIR = ../src/pjsua-lib export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ pjsua_acc.o pjsua_call.o pjsua_core.o \ - pjsua_im.o pjsua_media.o pjsua_pres.o -export PJSUA_LIB_CFLAGS += $(_CFLAGS) + pjsua_im.o pjsua_media.o pjsua_pres.o \ + pjsua_dump.o pjsua_vid.o +export PJSUA_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT diff --git a/pjsip/build/pjsip.dsw b/pjsip/build/pjsip.dsw deleted file mode 100644 index 06c45c2f..00000000 --- a/pjsip/build/pjsip.dsw +++ /dev/null @@ -1,152 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pjlib"=..\..\pjlib\build\pjlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjlib++"="..\..\pjlib\build\pjlib++.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjmedia"=..\..\pjmedia\build\pjmedia.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjmedia_codec"=..\..\pjmedia\build\pjmedia_codec.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsip_core"=.\pjsip_core.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib_util - End Project Dependency -}}} - -############################################################################### - -Project: "pjsip_simple"=.\pjsip_simple.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsip_ua"=.\pjsip_ua.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsua_lib"=.\pjsua_lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "test_pjsip"=.\test_pjsip.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib_util - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/pjsip/build/pjsip_core.dsp b/pjsip/build/pjsip_core.dsp deleted file mode 100644 index bd916bec..00000000 --- a/pjsip/build/pjsip_core.dsp +++ /dev/null @@ -1,385 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsip_core" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjsip_core - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjsip_core.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjsip_core.mak" CFG="pjsip_core - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsip_core - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjsip_core - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjsip_core - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjsip-core-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjsip-core-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjsip-core-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjsip-core-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-core-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjsip_core - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjsip-core-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjsip-core-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjsip-core-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjsip-core-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-core-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjsip_core - Win32 Release" -# Name "pjsip_core - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "Base (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_config.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_errno.c -# End Source File -# End Group -# Begin Group "Messaging and Parsing (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_msg.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_multipart.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_parser.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_tel_uri.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_uri.c -# End Source File -# End Group -# Begin Group "Core (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_endpoint.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_util.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_util_proxy.c -# End Source File -# End Group -# Begin Group "Transport Layer (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_resolve.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport_loop.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport_tls.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport_tls_ossl.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_transport_udp.c -# End Source File -# End Group -# Begin Group "Authentication (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_auth_aka.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_auth_client.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_auth_msg.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_auth_parser.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_auth_server.c -# End Source File -# End Group -# Begin Group "Transaction Layer (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_transaction.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_util_statefull.c -# End Source File -# End Group -# Begin Group "UA Layer (.c)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pjsip\sip_dialog.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsip\sip_ua_layer.c -# End Source File -# End Group -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "Base Types (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_config.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_errno.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_private.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_types.h -# End Source File -# End Group -# Begin Group "Messaging and Parsing (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\print_util.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_msg.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_multipart.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_parser.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_tel_uri.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_uri.h -# End Source File -# End Group -# Begin Group "Core (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_endpoint.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_event.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_module.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_util.h -# End Source File -# End Group -# Begin Group "Transport Layer (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_resolve.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_transport.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_transport_loop.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_transport_tcp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_transport_tls.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_transport_udp.h -# End Source File -# End Group -# Begin Group "Authentication (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_auth.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_auth_aka.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_auth_msg.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_auth_parser.h -# End Source File -# End Group -# Begin Group "Transaction Layer (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_transaction.h -# End Source File -# End Group -# Begin Group "UA Layer (.h)" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pjsip\sip_dialog.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip\sip_ua_layer.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\docs\doxygen.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "" -# End Group -# Begin Source File - -SOURCE=..\..\INSTALL.txt -# End Source File -# Begin Source File - -SOURCE=..\..\RELNOTES.txt -# End Source File -# End Target -# End Project diff --git a/pjsip/build/pjsip_simple.dsp b/pjsip/build/pjsip_simple.dsp deleted file mode 100644 index 8b584a97..00000000 --- a/pjsip/build/pjsip_simple.dsp +++ /dev/null @@ -1,186 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsip_simple" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjsip_simple - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjsip_simple.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjsip_simple.mak" CFG="pjsip_simple - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsip_simple - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjsip_simple - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjsip_simple - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "./output/pjsip-simple-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir "./output/pjsip-simple-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "./output/pjsip-simple-i386-win32-vc6-release" -# PROP Intermediate_Dir "./output/pjsip-simple-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib-util/include" /I "../../pjlib/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-simple-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjsip_simple - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "./output/pjsip-simple-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir "./output/pjsip-simple-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "./output/pjsip-simple-i386-win32-vc6-debug" -# PROP Intermediate_Dir "./output/pjsip-simple-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib-util/include" /I "../../pjlib/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-simple-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjsip_simple - Win32 Release" -# Name "pjsip_simple - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjsip-simple\errno.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\evsub.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\evsub_msg.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\iscomposing.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\mwi.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\pidf.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\presence.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\presence_body.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\publishc.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\rpid.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-simple\xpidf.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\include\pjsip-simple\errno.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\evsub.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\evsub_msg.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\iscomposing.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\mwi.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\pidf.h" -# End Source File -# Begin Source File - -SOURCE=..\include\pjsip_simple.h -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\presence.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\publish.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\rpid.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\types.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-simple\xpidf.h" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjsip/build/pjsip_test.dsp b/pjsip/build/pjsip_test.dsp deleted file mode 100644 index fd908070..00000000 --- a/pjsip/build/pjsip_test.dsp +++ /dev/null @@ -1,184 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsip_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjsip_test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjsip_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjsip_test.mak" CFG="pjsip_test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsip_test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjsip_test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjsip_test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\test-pjsip-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\test-pjsip-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /Ob2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../pjmedia/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib netapi32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /map /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-release.exe" /fixed:no - -!ELSEIF "$(CFG)" == "pjsip_test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\test-pjsip-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\test-pjsip-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../pjmedia/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib netapi32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-debug.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjsip_test - Win32 Release" -# Name "pjsip_test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\test\dlg_core_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\dns_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\inv_offer_answer_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\main.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\msg_err_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\msg_logger.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\msg_test.c" -# End Source File -# Begin Source File - -SOURCE=..\src\test\multipart_test.c -# End Source File -# Begin Source File - -SOURCE="..\src\test\regc_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\transport_loop_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\transport_tcp_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\transport_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\transport_udp_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\tsx_basic_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\tsx_bench.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\tsx_uac_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\tsx_uas_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\txdata_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\test\uri_test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\src\test\test.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/pjsip/build/pjsip_ua.dsp b/pjsip/build/pjsip_ua.dsp deleted file mode 100644 index 6a7b29f5..00000000 --- a/pjsip/build/pjsip_ua.dsp +++ /dev/null @@ -1,148 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsip_ua" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjsip_ua - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjsip_ua.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjsip_ua.mak" CFG="pjsip_ua - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsip_ua - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjsip_ua - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjsip_ua - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjsip-ua-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjsip-ua-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjsip-ua-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjsip-ua-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-ua-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjsip_ua - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjsip-ua-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjsip-ua-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjsip-ua-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjsip-ua-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjsip-ua-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjsip_ua - Win32 Release" -# Name "pjsip_ua - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_100rel.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_inv.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_reg.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_replaces.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_timer.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsip-ua\sip_xfer.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\pjsip_ua.h -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_100rel.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_inv.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_regc.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_replaces.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_timer.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsip-ua\sip_xfer.h" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjsip/build/pjsua_lib.dsp b/pjsip/build/pjsua_lib.dsp deleted file mode 100644 index 3defda24..00000000 --- a/pjsip/build/pjsua_lib.dsp +++ /dev/null @@ -1,128 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsua_lib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjsua_lib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjsua_lib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjsua_lib.mak" CFG="pjsua_lib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsua_lib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjsua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjsua_lib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjsua-lib-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjsua-lib-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjmedia/include" /I "../../pjlib-util/include" /I "../../pjlib/include" /I "../../pjnath/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\pjsua-lib-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjsua_lib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjsua-lib-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjsua-lib-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjsua-lib-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjmedia/include" /I "../../pjlib-util/include" /I "../../pjlib/include" /I "../../pjnath/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\pjsua-lib-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjsua_lib - Win32 Release" -# Name "pjsua_lib - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_acc.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_call.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_core.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_im.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_media.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjsua-lib\pjsua_pres.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\include\pjsua-lib\pjsua.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjsua-lib\pjsua_internal.h" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjsip/build/pjsua_lib.vcproj b/pjsip/build/pjsua_lib.vcproj index 0add9ad3..f36b2ab3 100644 --- a/pjsip/build/pjsua_lib.vcproj +++ b/pjsip/build/pjsua_lib.vcproj @@ -11,16 +11,16 @@ Name="Win32" /> + + @@ -3112,6 +3116,10 @@ /> + +