[asterisk-scf-commits] asterisk-scf/integration/pjproject.git branch "windows-64bit-build" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Mar 28 08:55:00 CDT 2011 

branch "windows-64bit-build" has been updated
       via  9af30e93214e998c2f1c6188d61f5bcf5b9e3b1a (commit)
      from  9876ef85e3984f8b576d5aa64fdfd705469c8b04 (commit)

Summary of changes:
 pjlib-util/build/pjlib_util.vcxproj    |   56 ++++++++++++++++----------------
 pjlib/build/pjlib.vcxproj              |   56 ++++++++++++++++----------------
 pjmedia/build/pjmedia.vcxproj          |   56 ++++++++++++++++----------------
 pjmedia/build/pjmedia_audiodev.vcxproj |   56 ++++++++++++++++----------------
 pjnath/build/pjnath.vcxproj            |   56 ++++++++++++++++----------------
 pjsip/build/pjsip_core.vcxproj         |   56 ++++++++++++++++----------------
 pjsip/build/pjsip_simple.vcxproj       |   56 ++++++++++++++++----------------
 pjsip/build/pjsip_ua.vcxproj           |   56 ++++++++++++++++----------------
 pjsip/build/pjsua_lib.vcxproj          |   56 ++++++++++++++++----------------
 third_party/build/srtp/libsrtp.vcxproj |   56 ++++++++++++++++----------------
 10 files changed, 280 insertions(+), 280 deletions(-)


- Log -----------------------------------------------------------------
commit 9af30e93214e998c2f1c6188d61f5bcf5b9e3b1a
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Mar 28 11:01:48 2011 -0230

    Modify target related project properties to use configuration macros.

diff --git a/pjlib-util/build/pjlib_util.vcxproj b/pjlib-util/build/pjlib_util.vcxproj
index 54195b6..cfd9944 100644
--- a/pjlib-util/build/pjlib_util.vcxproj
+++ b/pjlib-util/build/pjlib_util.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjlib-util-amd64-win32-vc10-release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjlib-util-amd64-win32-vc10-debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjlib-util-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjlib-util-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,10 +86,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-i386-win32-vc6-release/pjlib_util.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjlib-util-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjlib-util-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjlib-util-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -104,7 +104,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjlib-util-i386-win32-vc6-release/pjlib_util.bsc</OutputFile>
+      <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -116,10 +116,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-amd64-win32-vs2010-release/pjlib_util.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjlib-util-amd64-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjlib-util-amd64-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjlib-util-amd64-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,7 +134,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjlib-util-amd64-win32-vc6-release/pjlib_util.bsc</OutputFile>
+      <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -145,10 +145,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-i386-win32-vc6-debug/pjlib_util.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjlib-util-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjlib-util-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjlib-util-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +163,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjlib-util-i386-win32-vc6-debug/pjlib_util.bsc</OutputFile>
+      <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,10 +173,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-amd64-win32-vs2010-debug/pjlib_util.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjlib-util-amd64-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjlib-util-amd64-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjlib-util-amd64-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjlib_util.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjlib-util-amd64-win32-vc6-debug/pjlib_util.bsc</OutputFile>
+      <OutputFile>.\./output/pjlib-util-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib_util.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjlib/build/pjlib.vcxproj b/pjlib/build/pjlib.vcxproj
index 87744fe..4c08d03 100644
--- a/pjlib/build/pjlib.vcxproj
+++ b/pjlib/build/pjlib.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjlib-amd64-win32-vc10-debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjlib-amd64-win32-vc10-release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -85,10 +85,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjlib-i386-win32-vc6-debug/pjlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjlib-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjlib-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjlib-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjlib-i386-win32-vc6-debug/pjlib.bsc</OutputFile>
+      <OutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,10 +113,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32;PJ_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjlib-amd64-win32-vc6-debug/pjlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjlib-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjlib-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjlib-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -131,7 +131,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjlib-amd64-win32-vc6-debug/pjlib.bsc</OutputFile>
+      <OutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,10 +143,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjlib-i386-win32-vc6-release/pjlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjlib-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjlib-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjlib-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -161,7 +161,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjlib-i386-win32-vc6-release/pjlib.bsc</OutputFile>
+      <OutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -173,10 +173,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjlib-amd64-win32-vc6-release/pjlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjlib-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjlib-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjlib-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjlib-amd64-win32-vc6-release/pjlib.bsc</OutputFile>
+      <OutputFile>.\output\pjlib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjlib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjmedia/build/pjmedia.vcxproj b/pjmedia/build/pjmedia.vcxproj
index e05ff6e..3b3a7d0 100644
--- a/pjmedia/build/pjmedia.vcxproj
+++ b/pjmedia/build/pjmedia.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjmedia-amd64-win32-vc10-release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjmedia-amd64-win32-vc10-debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,10 +86,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-i386-win32-vc6-release/pjmedia.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -104,7 +104,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-i386-win32-vc6-release/pjmedia.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -116,10 +116,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-i386-win32-vc6-release/pjmedia.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,7 +134,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-i386-win32-vc6-release/pjmedia.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -145,10 +145,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-i386-win32-vc6-debug/pjmedia.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +163,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-i386-win32-vc6-debug/pjmedia.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,10 +173,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-i386-win32-vc6-debug/pjmedia.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-i386-win32-vc6-debug/pjmedia.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjmedia/build/pjmedia_audiodev.vcxproj b/pjmedia/build/pjmedia_audiodev.vcxproj
index 510fe61..d2d02fc 100644
--- a/pjmedia/build/pjmedia_audiodev.vcxproj
+++ b/pjmedia/build/pjmedia_audiodev.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjmedia-audiodev-amd64-win32-vc10-debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjmedia-audiodev-amd64-win32-vc10-release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjmedia-audiodev-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjmedia-audiodev-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjmedia-audiodev-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjmedia-audiodev-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -85,10 +85,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-debug/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-debug/pjmedia_audiodev.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,10 +113,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-amd64-win32-vs2010-debug/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -131,7 +131,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-debug/pjmedia_audiodev.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,10 +143,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-release/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-audiodev-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-audiodev-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -161,7 +161,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-release/pjmedia_audiodev.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -173,10 +173,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-amd64-win32-vs2010-release/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjmedia-audiodev-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjmedia-audiodev-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/pjmedia_audiodev.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjmedia-audiodev-i386-win32-vc6-release/pjmedia_audiodev.bsc</OutputFile>
+      <OutputFile>.\output\pjmedia-audiodev-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjmedia_audiodev.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjnath/build/pjnath.vcxproj b/pjnath/build/pjnath.vcxproj
index 29baa9d..7f28d03 100644
--- a/pjnath/build/pjnath.vcxproj
+++ b/pjnath/build/pjnath.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjnath-i386-win32-vc10-release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjnath-amd64-win32-vc10-debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-i386-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,10 +86,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjnath-i386-win32-vc6-release/pjnath.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjnath-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjnath-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjnath-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjnath-i386-win32-vc6-release/pjnath.bsc</OutputFile>
+      <OutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -115,10 +115,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjnath-amd64-win32-vc10-release/pjnath.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjnath-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjnath-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjnath-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -132,7 +132,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjnath-i386-win32-vc6-release/pjnath.bsc</OutputFile>
+      <OutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -143,10 +143,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjnath-i386-win32-vc6-debug/pjnath.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjnath-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjnath-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjnath-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -161,7 +161,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjnath-i386-win32-vc6-debug/pjnath.bsc</OutputFile>
+      <OutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -171,10 +171,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjnath-amd64-win32-vc10-debug/pjnath.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjnath-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjnath-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjnath-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -189,7 +189,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjnath-i386-win32-vc6-debug/pjnath.bsc</OutputFile>
+      <OutputFile>.\./output/pjnath-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjnath.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjsip/build/pjsip_core.vcxproj b/pjsip/build/pjsip_core.vcxproj
index 050e23a..9d32134 100644
--- a/pjsip/build/pjsip_core.vcxproj
+++ b/pjsip/build/pjsip_core.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjsip-core-amd64-win32-vc10-release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsip-core-amd64-win32-vc10-debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-core-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-core-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-core-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-core-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,10 +86,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-core-i386-win32-vc6-release/pjsip_core.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-core-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-core-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-core-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -104,7 +104,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-core-i386-win32-vc6-release/pjsip_core.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -116,10 +116,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-core-i386-win32-vc6-release/pjsip_core.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-core-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-core-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-core-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,7 +134,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-core-i386-win32-vc6-release/pjsip_core.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -145,10 +145,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-core-i386-win32-vc6-debug/pjsip_core.pch</PrecompiledHeaderOutputFile>
-      <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>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +163,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-core-i386-win32-vc6-debug/pjsip_core.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,10 +173,10 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-core-i386-win32-vc6-debug/pjsip_core.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-core-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-core-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-core-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-core-i386-win32-vc6-debug/pjsip_core.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-core-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_core.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjsip/build/pjsip_simple.vcxproj b/pjsip/build/pjsip_simple.vcxproj
index d53719a..fcdab06 100644
--- a/pjsip/build/pjsip_simple.vcxproj
+++ b/pjsip/build/pjsip_simple.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjsip-simple-$(PlatformShortName)-win32-vc10-debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../lib/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../lib/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjsip-simple-$(PlatformShortName)-win32-vc10-release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-simple-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-simple-$(PlatformShortName)-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-simple-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-simple-$(PlatformShortName)-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../lib/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../lib/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -85,10 +85,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-i386-win32-vc6-debug/pjsip_simple.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjsip-simple-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjsip-simple-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjsip-simple-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjsip-simple-i386-win32-vc6-debug/pjsip_simple.bsc</OutputFile>
+      <OutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,10 +113,10 @@
       <PreprocessorDefinitions>_DEBUG;PJ_WIN32=1;PJ_M_X86_64=1;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-i386-win32-vc6-debug/pjsip_simple.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjsip-simple-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjsip-simple-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjsip-simple-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -131,7 +131,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjsip-simple-i386-win32-vc6-debug/pjsip_simple.bsc</OutputFile>
+      <OutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,10 +143,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-i386-win32-vc6-release/pjsip_simple.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjsip-simple-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjsip-simple-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjsip-simple-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -160,7 +160,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjsip-simple-i386-win32-vc6-release/pjsip_simple.bsc</OutputFile>
+      <OutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -172,10 +172,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-i386-win32-vc6-release/pjsip_simple.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\./output/pjsip-simple-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\./output/pjsip-simple-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\./output/pjsip-simple-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -189,7 +189,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\./output/pjsip-simple-i386-win32-vc6-release/pjsip_simple.bsc</OutputFile>
+      <OutputFile>.\./output/pjsip-simple-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_simple.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjsip/build/pjsip_ua.vcxproj b/pjsip/build/pjsip_ua.vcxproj
index a629510..967ad74 100644
--- a/pjsip/build/pjsip_ua.vcxproj
+++ b/pjsip/build/pjsip_ua.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjsip-ua-i386-win32-vc10-release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsip-ua-amd64-win32-vc10-debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-ua-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-ua-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-ua-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-ua-i386-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,10 +86,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-i386-win32-vc6-release/pjsip_ua.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-ua-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-ua-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-ua-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -104,7 +104,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-ua-i386-win32-vc6-release/pjsip_ua.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -116,10 +116,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-i386-win32-vc6-release/pjsip_ua.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-ua-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-ua-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-ua-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,7 +134,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-ua-i386-win32-vc6-release/pjsip_ua.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -145,10 +145,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-i386-win32-vc6-debug/pjsip_ua.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-ua-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-ua-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-ua-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -163,7 +163,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-ua-i386-win32-vc6-debug/pjsip_ua.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,10 +173,10 @@
       <PreprocessorDefinitions>_DEBUG;PJ_WIN32=1;PJ_M_X86_64=1;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-amd64-win32-vc10-debug/pjsip_ua.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsip-ua-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsip-ua-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsip-ua-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsip-ua-i386-win32-vc6-debug/pjsip_ua.bsc</OutputFile>
+      <OutputFile>.\output\pjsip-ua-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsip_ua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/pjsip/build/pjsua_lib.vcxproj b/pjsip/build/pjsua_lib.vcxproj
index ba21ce2..879a7e1 100644
--- a/pjsip/build/pjsua_lib.vcxproj
+++ b/pjsip/build/pjsua_lib.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsua-lib-amd64-win32-vc10-debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\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)'=='Debug|x64'">pjsua-lib-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsua-lib-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsua-lib-i386-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -85,10 +85,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-i386-win32-vc6-debug/pjsua_lib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsua-lib-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsua-lib-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsua-lib-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsua-lib-i386-win32-vc6-debug/pjsua_lib.bsc</OutputFile>
+      <OutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,10 +113,10 @@
       <PreprocessorDefinitions>_DEBUG;PJ_WIN32=1;PJ_M_X86_64=1;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-amd64-win32-vc10-debug/pjsua_lib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsua-lib-amd64-win32-vc10-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsua-lib-amd64-win32-vc10-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsua-lib-amd64-win32-vc10-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -131,7 +131,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsua-lib-i386-win32-vc6-debug/pjsua_lib.bsc</OutputFile>
+      <OutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,10 +143,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-i386-win32-vc6-release/pjsua_lib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsua-lib-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsua-lib-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsua-lib-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -161,7 +161,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsua-lib-i386-win32-vc6-release/pjsua_lib.bsc</OutputFile>
+      <OutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -173,10 +173,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-i386-win32-vc6-release/pjsua_lib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\pjsua-lib-amd64-win32-vc10-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\pjsua-lib-amd64-win32-vc10-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\pjsua-lib-amd64-win32-vc10-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -191,7 +191,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\pjsua-lib-i386-win32-vc6-release/pjsua_lib.bsc</OutputFile>
+      <OutputFile>.\output\pjsua-lib-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/pjsua_lib.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/third_party/build/srtp/libsrtp.vcxproj b/third_party/build/srtp/libsrtp.vcxproj
index 9b1c375..c709720 100644
--- a/third_party/build/srtp/libsrtp.vcxproj
+++ b/third_party/build/srtp/libsrtp.vcxproj
@@ -66,16 +66,16 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-i386-win32-vc10-debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\libsrtp-amd64-win32-vc10-debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-i386-win32-vc10-release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\libsrtp-amd64-win32-vc10-release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-i386-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-amd64-win32-vc10-debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-i386-win32-vc10-release</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-amd64-win32-vc10-release</TargetName>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -85,10 +85,10 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\libsrtp-i386-win32-vc6-debug/libsrtp.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\libsrtp-i386-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\libsrtp-i386-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\libsrtp-i386-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -103,7 +103,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\libsrtp-i386-win32-vc6-debug/libsrtp.bsc</OutputFile>
+      <OutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,10 +113,10 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;PJ_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\output\libsrtp-amd64-win32-vs2010-debug/libsrtp.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\libsrtp-amd64-win32-vc6-debug/</AssemblerListingLocation>
-      <ObjectFileName>.\output\libsrtp-amd64-win32-vc6-debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\libsrtp-amd64-win32-vc6-debug/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/libsrtp.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -131,7 +131,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\libsrtp-i386-win32-vc6-debug/libsrtp.bsc</OutputFile>
+      <OutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,10 +143,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\libsrtp-i386-win32-vc6-release/libsrtp.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\libsrtp-i386-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\libsrtp-i386-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\libsrtp-i386-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -160,7 +160,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\libsrtp-i386-win32-vc6-release/libsrtp.bsc</OutputFile>
+      <OutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -172,10 +172,10 @@
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\output\libsrtp-i386-win32-vs2010-release/libsrtp.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\output\libsrtp-amd64-win32-vc6-release/</AssemblerListingLocation>
-      <ObjectFileName>.\output\libsrtp-amd64-win32-vc6-release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\output\libsrtp-amd64-win32-vc6-release/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-vs2010-$(Configuration)/libsrtp.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</AssemblerListingLocation>
+      <ObjectFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ObjectFileName>
+      <ProgramDataBaseFileName>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -189,7 +189,7 @@
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\output\libsrtp-i386-win32-vc6-release/libsrtp.bsc</OutputFile>
+      <OutputFile>.\output\libsrtp-$(PlatformShortName)-$(Platform)-$(PlatformToolset)-$(Configuration)/libsrtp.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/pjproject.git

More information about the asterisk-scf-commits mailing list