[asterisk-scf-commits] asterisk-scf/release/pjproject.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 15:04:02 UTC 2011
branch "master" has been updated
via bfd266734358d3440846754a8ce5ebb5449ef51d (commit)
via 1777f36fad37e43c63d311fa00218bc27594539e (commit)
from 12963ff1afe16783270d2e03f63a320411f5e09f (commit)
Summary of changes:
pjlib-util/build/pjlib_util.vcxproj | 12 ++++++------
pjlib/build/pjlib.vcxproj | 12 ++++++------
pjmedia/build/pjmedia.vcxproj | 12 ++++++------
pjmedia/build/pjmedia_audiodev.vcxproj | 12 ++++++------
pjnath/build/pjnath.vcxproj | 12 ++++++------
pjsip/build/pjsip_core.vcxproj | 18 +++++++++---------
pjsip/build/pjsip_simple.vcxproj | 12 ++++++------
pjsip/build/pjsip_ua.vcxproj | 12 ++++++------
pjsip/build/pjsua_lib.vcxproj | 12 ++++++------
third_party/build/srtp/libsrtp.vcxproj | 12 ++++++------
10 files changed, 63 insertions(+), 63 deletions(-)
- Log -----------------------------------------------------------------
commit bfd266734358d3440846754a8ce5ebb5449ef51d
Author: Joshua Colp <jcolp at digium.com>
Date: Fri Jan 7 11:01:42 2011 -0400
Further tweaks to have libraries placed into the correct location when built.
diff --git a/pjlib-util/build/pjlib_util.vcxproj b/pjlib-util/build/pjlib_util.vcxproj
index 0076052..e0a0913 100644
--- a/pjlib-util/build/pjlib_util.vcxproj
+++ b/pjlib-util/build/pjlib_util.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-i386-win32-vc10-release</TargetName>
diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj
index 56c7274..dee86d7 100644
--- a/pjlib/build/pjlib.vcxproj
+++ b/pjlib/build/pjlib.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj
index f2178e7..f340135 100644
--- a/pjmedia/build/pjmedia.vcxproj
+++ b/pjmedia/build/pjmedia.vcxproj
@@ -38,11 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-i386-win32-vc10-debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/pjmedia/build/pjmedia_audiodev.vcxproj b/pjmedia/build/pjmedia_audiodev.vcxproj
index f3f3541..f7b2bf8 100644
--- a/pjmedia/build/pjmedia_audiodev.vcxproj
+++ b/pjmedia/build/pjmedia_audiodev.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjmedia-audiodev-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjmedia-audiodev-i386-win32-vc10-release</TargetName>
diff --git a/pjnath/build/pjnath.vcxproj b/pjnath/build/pjnath.vcxproj
index 193cce6..ba9133a 100644
--- a/pjnath/build/pjnath.vcxproj
+++ b/pjnath/build/pjnath.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-i386-win32-vc10-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-i386-win32-vc10-debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
diff --git a/pjsip/build/pjsip_core.vcxproj b/pjsip/build/pjsip_core.vcxproj
index 8ac82bb..3cf4043 100644
--- a/pjsip/build/pjsip_core.vcxproj
+++ b/pjsip/build/pjsip_core.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-i386-win32-vc10-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-i386-win32-vc10-debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-core-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-core-i386-win32-vc10-release</TargetName>
diff --git a/pjsip/build/pjsip_simple.vcxproj b/pjsip/build/pjsip_simple.vcxproj
index 4a5c398..64986e0 100644
--- a/pjsip/build/pjsip_simple.vcxproj
+++ b/pjsip/build/pjsip_simple.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-i386-win32-vc10-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-i386-win32-vc10-release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-simple-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-simple-i386-win32-vc10-release</TargetName>
diff --git a/pjsip/build/pjsip_ua.vcxproj b/pjsip/build/pjsip_ua.vcxproj
index 3fdfda8..fd9f437 100644
--- a/pjsip/build/pjsip_ua.vcxproj
+++ b/pjsip/build/pjsip_ua.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-i386-win32-vc10-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-i386-win32-vc10-debug\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-ua-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-ua-i386-win32-vc10-release</TargetName>
diff --git a/pjsip/build/pjsua_lib.vcxproj b/pjsip/build/pjsua_lib.vcxproj
index 49364e9..9d6f0c5 100644
--- a/pjsip/build/pjsua_lib.vcxproj
+++ b/pjsip/build/pjsua_lib.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-i386-win32-vc10-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-i386-win32-vc10-release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsua-lib-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsua-lib-i386-win32-vc10-release</TargetName>
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj
index 8498e3d..f330047 100644
--- a/third_party/build/srtp/libsrtp.vcxproj
+++ b/third_party/build/srtp/libsrtp.vcxproj
@@ -38,9 +38,9 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-i386-win32-vc10-debug\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-i386-win32-vc10-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-i386-win32-vc10-release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-i386-win32-vc10-release\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
commit 1777f36fad37e43c63d311fa00218bc27594539e
Author: Joshua Colp <jcolp at digium.com>
Date: Fri Jan 7 10:55:12 2011 -0400
Ensure pjproject files are built with the vc10 filename to conform to the file naming convention.
diff --git a/pjlib-util/build/pjlib_util.vcxproj b/pjlib-util/build/pjlib_util.vcxproj
index a6966e7..0076052 100644
--- a/pjlib-util/build/pjlib_util.vcxproj
+++ b/pjlib-util/build/pjlib_util.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjlib-util-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjlib-util-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjlib-util-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjlib-util-i386-win32-vc6-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -66,7 +68,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjlib-util-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjlib-util-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj
index cf60fbf..56c7274 100644
--- a/pjlib/build/pjlib.vcxproj
+++ b/pjlib/build/pjlib.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjlib-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjlib-i386-win32-vc6-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjlib-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjlib-i386-win32-vc6-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjlib-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjlib-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj
index 524fff2..f2178e7 100644
--- a/pjmedia/build/pjmedia.vcxproj
+++ b/pjmedia/build/pjmedia.vcxproj
@@ -40,8 +40,9 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-i386-win32-vc6-release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjmedia-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjmedia-i386-win32-vc6-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-i386-win32-vc10-debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -66,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjmedia-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +96,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjmedia-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjmedia/build/pjmedia_audiodev.vcxproj b/pjmedia/build/pjmedia_audiodev.vcxproj
index 2820506..f3f3541 100644
--- a/pjmedia/build/pjmedia_audiodev.vcxproj
+++ b/pjmedia/build/pjmedia_audiodev.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjmedia-audiodev-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjmedia-audiodev-i386-win32-vc6-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-audiodev-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjmedia-audiodev-i386-win32-vc6-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjmedia-audiodev-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjmedia-audiodev-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjmedia-audiodev-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjmedia-audiodev-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjnath/build/pjnath.vcxproj b/pjnath/build/pjnath.vcxproj
index e569ceb..193cce6 100644
--- a/pjnath/build/pjnath.vcxproj
+++ b/pjnath/build/pjnath.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjnath-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjnath-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjnath-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjnath-i386-win32-vc6-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-i386-win32-vc10-debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjnath-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -95,7 +96,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjnath-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjsip/build/pjsip_core.vcxproj b/pjsip/build/pjsip_core.vcxproj
index 5ed8f38..8ac82bb 100644
--- a/pjsip/build/pjsip_core.vcxproj
+++ b/pjsip/build/pjsip_core.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsip-core-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsip-core-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsip-core-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsip-core-i386-win32-vc6-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-i386-win32-vc10-debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-core-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-core-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -66,7 +68,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-core-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -83,9 +84,9 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\output\pjsip-core-i386-win32-vc6-debug/pjsip_core.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\output\pjsip-core-i386-win32-vc6-debug/</AssemblerListingLocation>
- <ObjectFileName>.\output\pjsip-core-i386-win32-vc6-debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\output\pjsip-core-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+ <AssemblerListingLocation>.\output\pjsip-core-i386-win32-vc10-debug/</AssemblerListingLocation>
+ <ObjectFileName>.\output\pjsip-core-i386-win32-vc10-debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\output\pjsip-core-i386-win32-vc10-debug/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-core-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjsip/build/pjsip_simple.vcxproj b/pjsip/build/pjsip_simple.vcxproj
index bc67c23..4a5c398 100644
--- a/pjsip/build/pjsip_simple.vcxproj
+++ b/pjsip/build/pjsip_simple.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjsip-simple-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\./output/pjsip-simple-i386-win32-vc6-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjsip-simple-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\./output/pjsip-simple-i386-win32-vc6-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-i386-win32-vc10-release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-simple-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-simple-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-simple-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -95,7 +96,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-simple-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjsip/build/pjsip_ua.vcxproj b/pjsip/build/pjsip_ua.vcxproj
index 58673d6..3fdfda8 100644
--- a/pjsip/build/pjsip_ua.vcxproj
+++ b/pjsip/build/pjsip_ua.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsip-ua-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsip-ua-i386-win32-vc6-release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsip-ua-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsip-ua-i386-win32-vc6-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-i386-win32-vc10-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-i386-win32-vc10-debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-ua-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-ua-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -66,7 +68,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-ua-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>../lib/pjsip-ua-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/pjsip/build/pjsua_lib.vcxproj b/pjsip/build/pjsua_lib.vcxproj
index a1d7631..49364e9 100644
--- a/pjsip/build/pjsua_lib.vcxproj
+++ b/pjsip/build/pjsua_lib.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsua-lib-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\pjsua-lib-i386-win32-vc6-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsua-lib-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\pjsua-lib-i386-win32-vc6-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-i386-win32-vc10-release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsua-lib-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsua-lib-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\lib\pjsua-lib-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -96,7 +97,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\lib\pjsua-lib-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj
index 89cbfb2..8498e3d 100644
--- a/third_party/build/srtp/libsrtp.vcxproj
+++ b/third_party/build/srtp/libsrtp.vcxproj
@@ -38,10 +38,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\libsrtp-i386-win32-vc6-debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\output\libsrtp-i386-win32-vc6-debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\libsrtp-i386-win32-vc6-release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\output\libsrtp-i386-win32-vc6-release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-i386-win32-vc10-debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-i386-win32-vc10-debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-i386-win32-vc10-release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-i386-win32-vc10-release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,7 +67,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\libsrtp-i386-win32-vc6-debug.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -95,7 +96,6 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\libsrtp-i386-win32-vc6-release.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
-----------------------------------------------------------------------
--
asterisk-scf/release/pjproject.git
More information about the asterisk-scf-commits
mailing list