From e58d19666ee71630cbc267928b4f9cac1fa09580 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Mon, 9 Apr 2007 07:06:08 +0000 Subject: Fixed all VS6 and VS8 projects with new third party projects layout git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1177 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/build/Samples-vc.mak | 12 +++- pjsip-apps/build/pjsip_apps.dsw | 105 +++++++++++++++++++++++++++++++++++ pjsip-apps/build/pjsua.vcproj | 2 +- pjsip-apps/build/sample_debug.vcproj | 2 +- pjsip-apps/build/samples.vcproj | 2 +- pjsip-apps/src/samples/pjsip-perf.c | 4 +- 6 files changed, 121 insertions(+), 6 deletions(-) (limited to 'pjsip-apps') diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index 18d5d65c..bd8d6d4f 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -18,9 +18,19 @@ PJSIP_UA_LIB = ..\..\pjsip\lib\pjsip-ua-$(TARGET)$(LIBEXT) PJSIP_SIMPLE_LIB = ..\..\pjsip\lib\pjsip-simple-$(TARGET)$(LIBEXT) PJSUA_LIB_LIB = ..\..\pjsip\lib\pjsua-lib-$(TARGET)$(LIBEXT) +GSM_LIB = ..\..\third_party\lib\libgsmcodec-$(TARGET)$(LIBEXT) +ILBC_LIB = ..\..\third_party\lib\libilbccodec-$(TARGET)$(LIBEXT) +PORTAUDIO_LIB = ..\..\third_party\lib\libportaudio-$(TARGET)$(LIBEXT) +RESAMPLE_LIB = ..\..\third_party\lib\libresample-$(TARGET)$(LIBEXT) +SPEEX_LIB = ..\..\third_party\lib\libspeex-$(TARGET)$(LIBEXT) + +THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \ + $(SPEEX_LIB) + LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \ $(PJSIP_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_LIB) $(PJNATH_LIB) \ - $(PJLIB_UTIL_LIB) $(PJLIB_LIB) + $(PJLIB_UTIL_LIB) $(PJLIB_LIB) \ + $(THIRD_PARTY_LIBS) CFLAGS = /DPJ_WIN32=1 /DPJ_M_I386=1 \ $(BUILD_FLAGS) \ diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw index d97b3c70..ebc52ccd 100644 --- a/pjsip-apps/build/pjsip_apps.dsw +++ b/pjsip-apps/build/pjsip_apps.dsw @@ -3,6 +3,66 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +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: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4> Package=<5> @@ -134,6 +194,21 @@ Package=<4> 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 }}} ############################################################################### @@ -185,6 +260,21 @@ Package=<4> 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 }}} ############################################################################### @@ -221,6 +311,21 @@ Package=<4> 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 }}} ############################################################################### diff --git a/pjsip-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj index d11e57cc..ae598229 100644 --- a/pjsip-apps/build/pjsua.vcproj +++ b/pjsip-apps/build/pjsua.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="pjsua" - ProjectGUID="{19EBB464-60E7-47C5-96D8-E012B8CF3A41}" + ProjectGUID="{8310649E-A25E-4AF0-91E8-9E3CC659BB89}" RootNamespace="pjsua" > diff --git a/pjsip-apps/build/sample_debug.vcproj b/pjsip-apps/build/sample_debug.vcproj index 39a09317..1fa16da9 100644 --- a/pjsip-apps/build/sample_debug.vcproj +++ b/pjsip-apps/build/sample_debug.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="sample_debug" - ProjectGUID="{E13CECAA-8A8E-48CC-841F-5C4B845F0ECB}" + ProjectGUID="{A0F1AA62-0F6F-420D-B09A-AC04B6862821}" RootNamespace="sample_debug" > diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj index 0d872689..986dacbd 100644 --- a/pjsip-apps/build/samples.vcproj +++ b/pjsip-apps/build/samples.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="samples" - ProjectGUID="{3CE5B675-EF25-434E-8AC2-23F0D76D1719}" + ProjectGUID="{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}" RootNamespace="samples" Keyword="MakeFileProj" > diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index 264c2065..e3d7fc43 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -751,13 +751,13 @@ static pj_status_t create_app(void) */ static pj_status_t init_sip() { - pj_status_t status; + pj_status_t status = -1; /* Add UDP/TCP transport. */ { pj_sockaddr_in addr; pjsip_host_port addrname; - const char *transport_type; + const char *transport_type = NULL; pj_bzero(&addr, sizeof(addr)); addr.sin_family = PJ_AF_INET; -- cgit v1.2.3