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-apps/build/Makefile | 2 +- pjsip-apps/build/Samples-vc.mak | 6 +- pjsip-apps/build/Samples.mak | 5 +- pjsip-apps/build/pjsip_apps.dsw | 443 ------------------- pjsip-apps/build/pjsua.dsp | 109 ----- pjsip-apps/build/pjsua.vcproj | 811 ++++++++++++++++++----------------- pjsip-apps/build/pjsystest.dsp | 122 ------ pjsip-apps/build/py_pjsua.dsp | 126 ------ pjsip-apps/build/python_pjsua.dsp | 116 ----- pjsip-apps/build/sample_debug.dsp | 104 ----- pjsip-apps/build/sample_debug.vcproj | 354 +++++++-------- pjsip-apps/build/samples.dsp | 241 ----------- pjsip-apps/build/samples.vcproj | 476 ++++++++++---------- 13 files changed, 838 insertions(+), 2077 deletions(-) delete mode 100644 pjsip-apps/build/pjsip_apps.dsw delete mode 100644 pjsip-apps/build/pjsua.dsp delete mode 100644 pjsip-apps/build/pjsystest.dsp delete mode 100644 pjsip-apps/build/py_pjsua.dsp delete mode 100644 pjsip-apps/build/python_pjsua.dsp delete mode 100644 pjsip-apps/build/sample_debug.dsp delete mode 100644 pjsip-apps/build/samples.dsp (limited to 'pjsip-apps/build') diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index 08e2ca00..146e841e 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -20,7 +20,7 @@ PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) # Gather all flags. # export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ - $(CFLAGS) $(CC_INC)../../pjsip/include \ + $(PJ_CFLAGS) $(CFLAGS) $(CC_INC)../../pjsip/include \ $(CC_INC)../../pjlib/include \ $(CC_INC)../../pjlib-util/include \ $(CC_INC)../../pjnath/include \ diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index b938e2c0..b3a76e6b 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -21,6 +21,7 @@ PJNATH_LIB = ..\..\pjnath\lib\pjnath-$(TARGET)$(LIBEXT) PJMEDIA_LIB = ..\..\pjmedia\lib\pjmedia-$(TARGET)$(LIBEXT) PJMEDIA_CODEC_LIB = ..\..\pjmedia\lib\pjmedia-codec-$(TARGET)$(LIBEXT) PJMEDIA_AUDIODEV_LIB = ..\..\pjmedia\lib\pjmedia-audiodev-$(TARGET)$(LIBEXT) +PJMEDIA_VIDEODEV_LIB = ..\..\pjmedia\lib\pjmedia-videodev-$(TARGET)$(LIBEXT) PJSIP_LIB = ..\..\pjsip\lib\pjsip-core-$(TARGET)$(LIBEXT) PJSIP_UA_LIB = ..\..\pjsip\lib\pjsip-ua-$(TARGET)$(LIBEXT) PJSIP_SIMPLE_LIB = ..\..\pjsip\lib\pjsip-simple-$(TARGET)$(LIBEXT) @@ -39,6 +40,7 @@ THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \ LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \ $(PJSIP_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_AUDIODEV_LIB) \ + $(PJMEDIA_VIDEODEV_LIB) \ $(PJMEDIA_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB) \ $(THIRD_PARTY_LIBS) @@ -60,6 +62,7 @@ BINDIR = ..\bin\samples\$(TARGET) SAMPLES = $(BINDIR)\auddemo.exe \ $(BINDIR)\aectest.exe \ + $(BINDIR)\aviplay.exe \ $(BINDIR)\confsample.exe \ $(BINDIR)\confbench.exe \ $(BINDIR)\encdec.exe \ @@ -84,7 +87,8 @@ SAMPLES = $(BINDIR)\auddemo.exe \ $(BINDIR)\stereotest.exe \ $(BINDIR)\streamutil.exe \ $(BINDIR)\strerror.exe \ - $(BINDIR)\tonegen.exe + $(BINDIR)\tonegen.exe \ + $(BINDIR)\vid_streamutil.exe all: $(BINDIR) $(OBJDIR) $(SAMPLES) diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index bba68b46..ee16e52e 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -14,7 +14,9 @@ OBJDIR := ./output/samples-$(TARGET_NAME) BINDIR := ../bin/samples/$(TARGET_NAME) SAMPLES := auddemo \ + aviplay \ aectest \ + aviplay \ confsample \ encdec \ httpdemo \ @@ -38,7 +40,8 @@ SAMPLES := auddemo \ stereotest \ streamutil \ strerror \ - tonegen + tonegen \ + vid_streamutil EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE)) diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw deleted file mode 100644 index 6945bc53..00000000 --- a/pjsip-apps/build/pjsip_apps.dsw +++ /dev/null @@ -1,443 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libg7221codec"="..\..\third_party\build\g7221\libg7221codec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libgsmcodec"="..\..\third_party\build\gsm\libgsmcodec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libilbccodec"="..\..\third_party\build\ilbc\libilbccodec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libportaudio"="..\..\third_party\build\portaudio\libportaudio.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libresample"="..\..\third_party\build\resample\libresample.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libspeex"="..\..\third_party\build\speex\libspeex.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libsrtp"="..\..\third_party\build\srtp\libsrtp.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_audiodev"="..\..\pjmedia\build\pjmedia_audiodev.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjmedia_codec"="..\..\pjmedia\build\pjmedia_codec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjnath"="..\..\pjnath\build\pjnath.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsip_core"="..\..\pjsip\build\pjsip_core.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsip_simple"="..\..\pjsip\build\pjsip_simple.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsip_ua"="..\..\pjsip\build\pjsip_ua.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjsua"=".\pjsua.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 - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_codec - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_simple - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_ua - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsua_lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjnath - End Project Dependency - Begin Project Dependency - Project_Dep_Name libgsmcodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libilbccodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libportaudio - End Project Dependency - Begin Project Dependency - Project_Dep_Name libresample - End Project Dependency - Begin Project Dependency - Project_Dep_Name libspeex - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_audiodev - End Project Dependency - Begin Project Dependency - Project_Dep_Name libsrtp - End Project Dependency - Begin Project Dependency - Project_Dep_Name libg7221codec - End Project Dependency -}}} - -############################################################################### - -Project: "pjsua_lib"="..\..\pjsip\build\pjsua_lib.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "python_pjsua"=".\python_pjsua.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libgsmcodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libilbccodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libportaudio - End Project Dependency - Begin Project Dependency - Project_Dep_Name libresample - End Project Dependency - Begin Project Dependency - Project_Dep_Name libspeex - End Project Dependency - Begin Project Dependency - Project_Dep_Name libsrtp - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib_util - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_codec - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjnath - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_simple - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_ua - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsua_lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_audiodev - End Project Dependency - Begin Project Dependency - Project_Dep_Name libg7221codec - End Project Dependency -}}} - -############################################################################### - -Project: "sample_debug"=".\sample_debug.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 - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_codec - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_simple - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_ua - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsua_lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name libgsmcodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libilbccodec - End Project Dependency - Begin Project Dependency - Project_Dep_Name libportaudio - End Project Dependency - Begin Project Dependency - Project_Dep_Name libresample - End Project Dependency - Begin Project Dependency - Project_Dep_Name libspeex - End Project Dependency - Begin Project Dependency - Project_Dep_Name libsrtp - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_audiodev - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjnath - End Project Dependency -}}} - -############################################################################### - -Project: "samples"=".\samples.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 - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia_codec - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_simple - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_ua - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsua_lib - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/pjsip-apps/build/pjsua.dsp b/pjsip-apps/build/pjsua.dsp deleted file mode 100644 index 7aafa8df..00000000 --- a/pjsip-apps/build/pjsua.dsp +++ /dev/null @@ -1,109 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjsua" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjsua - 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.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.mak" CFG="pjsua - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsua - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjsua - 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)" == "pjsua - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjsua-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjsua-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjsua-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjsua-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 /W4 /GX /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map:"..\bin\pjsua_vc6.map" /debug /machine:I386 /out:"../bin/pjsua_vc6.exe" /fixed:no -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "pjsua - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjsua-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjsua-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjsua-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjsua-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjsua_vc6d.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjsua - Win32 Release" -# Name "pjsua - 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\main.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsua\pjsua_app.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# 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-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj index 3c6c1f62..717d7dca 100644 --- a/pjsip-apps/build/pjsua.vcproj +++ b/pjsip-apps/build/pjsua.vcproj @@ -11,16 +11,16 @@ Name="Win32" /> + @@ -286,27 +289,25 @@ Name="VCBscMakeTool" /> - - + @@ -487,27 +490,25 @@ Name="VCBscMakeTool" /> - - @@ -542,13 +543,11 @@ - @@ -556,25 +555,27 @@ Name="VCBscMakeTool" /> - - + @@ -688,27 +691,25 @@ Name="VCBscMakeTool" /> - - + @@ -889,27 +892,25 @@ Name="VCBscMakeTool" /> - - @@ -1011,13 +1012,11 @@ - @@ -1025,25 +1024,27 @@ Name="VCBscMakeTool" /> - - + @@ -1090,27 +1093,25 @@ Name="VCBscMakeTool" /> - - @@ -1278,8 +1279,8 @@ /> @@ -1345,8 +1346,8 @@ /> @@ -1412,8 +1413,8 @@ /> @@ -1464,7 +1465,7 @@ /> @@ -1480,13 +1481,11 @@ - @@ -1494,23 +1493,25 @@ Name="VCBscMakeTool" /> - - @@ -1546,8 +1547,8 @@ /> @@ -1613,8 +1614,8 @@ /> @@ -1680,8 +1681,8 @@ /> @@ -1747,8 +1748,8 @@ /> @@ -1814,8 +1815,8 @@ /> @@ -1881,8 +1882,8 @@ /> @@ -1933,7 +1934,7 @@ /> @@ -1949,13 +1950,11 @@ - @@ -1963,23 +1962,25 @@ Name="VCBscMakeTool" /> - - @@ -2016,7 +2017,7 @@ @@ -2082,8 +2083,8 @@ /> @@ -2149,8 +2150,8 @@ /> @@ -2216,8 +2217,8 @@ /> @@ -2283,8 +2284,8 @@ /> @@ -2351,7 +2352,7 @@ @@ -2402,7 +2403,7 @@ /> @@ -2417,14 +2418,12 @@ /> - @@ -2432,23 +2431,25 @@ Name="VCBscMakeTool" /> - - @@ -2484,8 +2485,8 @@ /> @@ -2551,8 +2552,8 @@ /> @@ -2619,7 +2620,7 @@ @@ -2686,7 +2687,7 @@ @@ -2753,7 +2754,7 @@ @@ -2820,7 +2821,7 @@ -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjsystest - 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 "pjsystest.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 "pjsystest.mak" CFG="pjsystest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjsystest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjsystest - 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)" == "pjsystest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjsystest-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjsystest-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjsystest-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjsystest-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 /W4 /GX /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map:"..\bin\pjsystest_vc6.map" /debug /machine:I386 /out:"../bin/pjsystest_vc6.exe" /fixed:no -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "pjsystest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjsystest-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjsystest-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjsystest-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjsystest-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjsystest_vc6d.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjsystest - Win32 Release" -# Name "pjsystest - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\pjsystest\main_console.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjsystest\main_wm.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pjsystest\systest.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\pjsystest\gui.h -# End Source File -# Begin Source File - -SOURCE=..\src\pjsystest\systest.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-apps/build/py_pjsua.dsp b/pjsip-apps/build/py_pjsua.dsp deleted file mode 100644 index f73ee695..00000000 --- a/pjsip-apps/build/py_pjsua.dsp +++ /dev/null @@ -1,126 +0,0 @@ -# Microsoft Developer Studio Project File - Name="py_pjsua" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=py_pjsua - 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 "py_pjsua.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 "py_pjsua.mak" CFG="py_pjsua - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "py_pjsua - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "py_pjsua - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "py_pjsua - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\py_pjsua-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\py_pjsua-i386-win32-vc6-release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x421 /d "NDEBUG" -# ADD RSC /l 0x421 /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 /nologo /dll /machine:I386 -# ADD LINK32 python24.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /map /machine:I386 /nodefaultlib:"libcmt.lib" /out:"..\lib\py_pjsua.pyd" /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "py_pjsua - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\py_pjsua-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\py_pjsua-i386-win32-vc6-debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x421 /d "_DEBUG" -# ADD RSC /l 0x421 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 python24_d.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"..\lib\py_pjsua_d.pyd" /pdbtype:sept /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PCbuild" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PC\VC6" - -!ENDIF - -# Begin Target - -# Name "py_pjsua - Win32 Release" -# Name "py_pjsua - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\py_pjsua\pjsua.py -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\py_pjsua\pjsua_app.py -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\py_pjsua\py_pjsua.c -# End Source File -# Begin Source File - -SOURCE=..\src\py_pjsua\py_pjsua.def -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\py_pjsua\py_pjsua.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-apps/build/python_pjsua.dsp b/pjsip-apps/build/python_pjsua.dsp deleted file mode 100644 index 6b495e1c..00000000 --- a/pjsip-apps/build/python_pjsua.dsp +++ /dev/null @@ -1,116 +0,0 @@ -# Microsoft Developer Studio Project File - Name="python_pjsua" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=python_pjsua - 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 "python_pjsua.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 "python_pjsua.mak" CFG="python_pjsua - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "python_pjsua - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "python_pjsua - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "python_pjsua - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\python_pjsua-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\python_pjsua-i386-win32-vc6-release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x421 /d "NDEBUG" -# ADD RSC /l 0x421 /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 /nologo /dll /machine:I386 -# ADD LINK32 python24.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /map /machine:I386 /nodefaultlib:"libcmt.lib" /out:"..\lib\_pjsua.pyd" /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "python_pjsua - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\python_pjsua-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\python_pjsua-i386-win32-vc6-debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x421 /d "_DEBUG" -# ADD RSC /l 0x421 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 python24_d.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"..\lib\_pjsua_d.pyd" /pdbtype:sept /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PCbuild" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PC\VC6" - -!ENDIF - -# Begin Target - -# Name "python_pjsua - Win32 Release" -# Name "python_pjsua - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\python\_pjsua.c -# End Source File -# Begin Source File - -SOURCE=..\src\python\_pjsua.def -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\python\_pjsua.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-apps/build/sample_debug.dsp b/pjsip-apps/build/sample_debug.dsp deleted file mode 100644 index 03c49d16..00000000 --- a/pjsip-apps/build/sample_debug.dsp +++ /dev/null @@ -1,104 +0,0 @@ -# Microsoft Developer Studio Project File - Name="sample_debug" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=sample_debug - 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 "sample_debug.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 "sample_debug.mak" CFG="sample_debug - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "sample_debug - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "sample_debug - 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)" == "sample_debug - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "./output/samples-i386-win32-vc6-release" -# PROP Intermediate_Dir "./output/samples-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 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.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 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 /map /debug /machine:I386 /out:"../bin/samples/sampledebug_vc6.exe" /fixed:no -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "sample_debug - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "./output/samples-i386-win32-vc6-debug" -# PROP Intermediate_Dir "./output/samples-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 -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 Iphlpapi.lib ole32.lib user32.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.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 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 /map /debug /machine:I386 /out:"../bin/samples/sampledebug_vc6d.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "sample_debug - Win32 Release" -# Name "sample_debug - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\samples\debug.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# 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-apps/build/sample_debug.vcproj b/pjsip-apps/build/sample_debug.vcproj index 0df2cd13..f9e77266 100644 --- a/pjsip-apps/build/sample_debug.vcproj +++ b/pjsip-apps/build/sample_debug.vcproj @@ -34,11 +34,11 @@ -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=samples - 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 "samples.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 "samples.mak" CFG="samples - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "samples - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "samples - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "samples - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-release" -# PROP BASE Cmd_Line "NMAKE /f samples.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "samples.exe" -# PROP BASE Bsc_Name "samples.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "./output/samples-i386-win32-vc6-release" -# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-release" -# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=6" -# PROP Rebuild_Opt "/a" -# PROP Target_File "All samples" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "samples - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-debug" -# PROP BASE Cmd_Line "NMAKE /f samples.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "samples.exe" -# PROP BASE Bsc_Name "samples.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "./output/samples-i386-win32-vc6-debug" -# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-debug" -# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=6" -# PROP Rebuild_Opt "/a" -# PROP Target_File "All samples" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "samples - Win32 Release" -# Name "samples - Win32 Debug" - -!IF "$(CFG)" == "samples - Win32 Release" - -!ELSEIF "$(CFG)" == "samples - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\samples\aectest.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\auddemo.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\confbench.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\confsample.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\encdec.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\footprint.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\httpdemo.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\icedemo.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\invtester.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\jbsim.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\latency.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\level.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\mix.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\pcaputil.c -# End Source File -# Begin Source File - -SOURCE="..\src\samples\pjsip-perf.c" -# End Source File -# Begin Source File - -SOURCE=..\src\samples\playfile.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\playsine.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\recfile.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\resampleplay.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\simple_pjsua.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\simpleua.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\siprtp.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\siprtp_report.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\sipstateless.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\sndinfo.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\sndtest.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\stateful_proxy.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\stateless_proxy.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\stereotest.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\streamutil.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\strerror.c -# End Source File -# Begin Source File - -SOURCE=..\src\samples\tonegen.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\samples\proxy.h -# End Source File -# Begin Source File - -SOURCE=..\src\samples\util.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 -# Begin Source File - -SOURCE=".\Samples-vc.mak" -# End Source File -# Begin Source File - -SOURCE=.\Samples.mak -# End Source File -# End Target -# End Project diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj index 09767799..f7825e0a 100644 --- a/pjsip-apps/build/samples.vcproj +++ b/pjsip-apps/build/samples.vcproj @@ -136,32 +136,8 @@ /> - - - + + + + - - - - + + + + + + + + + + + - - - - - - - - + + @@ -1709,6 +1713,10 @@ RelativePath="..\src\samples\tonegen.c" > + +