28 files changed, 1380 insertions, 300 deletions

diff --git a/pjlib-util/build/pjlib_util.vcproj b/pjlib-util/build/pjlib_util.vcproj
index ad4adf26..cf2e2660 100644
--- a/pjlib-util/build/pjlib_util.vcproj
+++ b/pjlib-util/build/pjlib_util.vcproj
@@ -20,7 +20,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/pjlib-util-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjlib-util-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -464,7 +464,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -760,7 +760,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjlib-util/build/pjlib_util_test.vcproj b/pjlib-util/build/pjlib_util_test.vcproj
index d6fbc0e0..db7e6f0f 100644
--- a/pjlib-util/build/pjlib_util_test.vcproj
+++ b/pjlib-util/build/pjlib_util_test.vcproj
@@ -19,7 +19,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/pjlib-util-test-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjlib-util-test-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -524,7 +524,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -860,7 +860,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjlib/build/pjlib.vcproj b/pjlib/build/pjlib.vcproj
index a6faab5a..630ee275 100644
--- a/pjlib/build/pjlib.vcproj
+++ b/pjlib/build/pjlib.vcproj
@@ -169,7 +169,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjlib-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjlib-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -468,7 +468,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -768,7 +768,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjlib/build/pjlib_test.vcproj b/pjlib/build/pjlib_test.vcproj
index 0efc88ae..acfba0b5 100644
--- a/pjlib/build/pjlib_test.vcproj
+++ b/pjlib/build/pjlib_test.vcproj
@@ -190,7 +190,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjlib-test-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjlib-test-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -525,7 +525,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -862,7 +862,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj
index 485cb1a6..87efa8b1 100644
--- a/pjmedia/build/pjmedia.vcproj
+++ b/pjmedia/build/pjmedia.vcproj
@@ -20,7 +20,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjmedia-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjmedia-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -468,7 +468,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -768,7 +768,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjmedia/build/pjmedia_audiodev.vcproj b/pjmedia/build/pjmedia_audiodev.vcproj
index 9896173f..262fe4f6 100644
--- a/pjmedia/build/pjmedia_audiodev.vcproj
+++ b/pjmedia/build/pjmedia_audiodev.vcproj
@@ -92,7 +92,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjmedia-audiodev-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjmedia-audiodev-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -245,7 +245,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -398,7 +398,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjmedia/build/pjmedia_codec.vcproj b/pjmedia/build/pjmedia_codec.vcproj
index d4ccd3ec..853a2163 100644
--- a/pjmedia/build/pjmedia_codec.vcproj
+++ b/pjmedia/build/pjmedia_codec.vcproj
@@ -94,14 +94,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjmedia-codec-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjmedia-codec-i386-win32-vc8-release"

+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -120,37 +117,30 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

-				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				ExecutionBucket="7"

+				Optimization="0"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

+				ExceptionHandling="0"

+				RuntimeLibrary="1"

+				WarningLevel="3"

 				DebugInformationFormat="3"

+				CompileAs="0"

+				CompileForArchitecture="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

-				SuppressStartupBanner="true"

+				AdditionalOptions=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -160,20 +150,26 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Release|Win32"

+			OutputDirectory=".\output\pjmedia-codec-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -197,27 +193,28 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

+				Optimization="2"

+				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-debug/pjmedia_codec.pch"

-				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-debug/"

-				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-debug/"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

+				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

 				BrowseInformation="1"

 				WarningLevel="4"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -225,7 +222,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-debug.lib"

+				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -237,7 +234,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-debug/pjmedia_codec.bsc"

+				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -247,14 +244,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -273,37 +267,29 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

 				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

-				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

+				ExceptionHandling="0"

+				RuntimeLibrary="0"

+				WarningLevel="3"

+				DebugInformationFormat="0"

+				CompileAs="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

-				SuppressStartupBanner="true"

+				AdditionalOptions=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -313,18 +299,24 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Win32"

+			Name="Debug-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

@@ -355,7 +347,7 @@
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				RuntimeLibrary="1"

 				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-debug/pjmedia_codec.pch"

 				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-debug/"

 				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-debug/"

@@ -400,14 +392,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -423,40 +412,34 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

-				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				ExecutionBucket="7"

+				Optimization="0"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

+				ExceptionHandling="0"

+				RuntimeLibrary="1"

+				WarningLevel="3"

 				DebugInformationFormat="3"

+				CompileAs="0"

+				CompileForArchitecture="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

-				SuppressStartupBanner="true"

+				AdditionalOptions=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -466,22 +449,31 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

+			Name="Release-Dynamic|Win32"

+			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			CharacterSet="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -500,30 +492,37 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				FavorSizeOrSpeed="0"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

+				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalOptions=""

+				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -533,26 +532,20 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="4"

 			CharacterSet="1"

 			>

@@ -570,6 +563,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -622,11 +616,14 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			Name="Debug-Dynamic|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

-			CharacterSet="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -642,34 +639,39 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

 				Optimization="0"

-				FavorSizeOrSpeed="0"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-debug/pjmedia_codec.pch"

+				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-debug/"

+				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-debug/"

+				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-debug/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalOptions=""

+				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-debug.lib"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -679,24 +681,18 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-debug/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="4"

@@ -721,15 +717,16 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="2"

-				FavorSizeOrSpeed="2"

+				Optimization="0"

+				FavorSizeOrSpeed="0"

 				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

 				ExceptionHandling="0"

-				RuntimeLibrary="0"

+				RuntimeLibrary="1"

 				WarningLevel="3"

-				DebugInformationFormat="0"

+				DebugInformationFormat="3"

 				CompileAs="0"

+				CompileForArchitecture="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -769,11 +766,14 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			Name="Release-Static|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			CharacterSet="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -789,34 +789,40 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				FavorSizeOrSpeed="0"

-				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include"

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../include;../../pjlib/include;../../third_party/speex/include;../../third_party"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.pch"

+				AssemblerListingLocation=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ObjectFile=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				ProgramDataBaseFileName=".\output\pjmedia-codec-i386-win32-vc8-release/"

+				BrowseInformation="1"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalOptions=""

+				OutputFile="..\lib\pjmedia-codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -826,21 +832,15 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\pjmedia-codec-i386-win32-vc8-release/pjmedia_codec.bsc"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

 			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

diff --git a/pjmedia/build/pjmedia_test.vcproj b/pjmedia/build/pjmedia_test.vcproj
index ec221fda..4eac925c 100644
--- a/pjmedia/build/pjmedia_test.vcproj
+++ b/pjmedia/build/pjmedia_test.vcproj
@@ -190,7 +190,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjmedia_test_vc8_Release"

-			IntermediateDirectory=".\output\pjmedia_test_vc8_Release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -531,7 +531,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -873,7 +873,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjnath/build/pjnath.vcproj b/pjnath/build/pjnath.vcproj
index fb7281cc..fbe751b5 100644
--- a/pjnath/build/pjnath.vcproj
+++ b/pjnath/build/pjnath.vcproj
@@ -20,7 +20,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/pjnath-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjnath-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -468,7 +468,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -768,7 +768,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjnath/build/pjnath_test.vcproj b/pjnath/build/pjnath_test.vcproj
index b46acdd1..f6831bc8 100644
--- a/pjnath/build/pjnath_test.vcproj
+++ b/pjnath/build/pjnath_test.vcproj
@@ -191,7 +191,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/pjnath-test-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjnath-test-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -532,7 +532,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -874,7 +874,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjproject-vs8.sln b/pjproject-vs8.sln
index 39785db6..154a3b03 100644
--- a/pjproject-vs8.sln
+++ b/pjproject-vs8.sln
@@ -821,9 +821,10 @@ Global
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Win32.Build.0 = Debug|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.Build.0 = Debug|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I)

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|Win32.ActiveCfg = Debug|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|Win32.Build.0 = Debug|Win32

@@ -831,11 +832,11 @@ Global
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Win32.ActiveCfg = Release|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Win32.Build.0 = Release|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.ActiveCfg = Release|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.Build.0 = Release|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.ActiveCfg = Release|Win32

-		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.Build.0 = Release|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.ActiveCfg = Release-Static|Win32

+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.Build.0 = Release-Static|Win32

 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

diff --git a/pjsip-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj
index a2e729b7..ed140aea 100644
--- a/pjsip-apps/build/pjsua.vcproj
+++ b/pjsip-apps/build/pjsua.vcproj
@@ -20,7 +20,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjsua-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjsua-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -537,7 +537,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -884,7 +884,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip-apps/build/sample_debug.vcproj b/pjsip-apps/build/sample_debug.vcproj
index 32811c6c..1aa8b1f0 100644
--- a/pjsip-apps/build/sample_debug.vcproj
+++ b/pjsip-apps/build/sample_debug.vcproj
@@ -193,7 +193,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/samples-i386-win32-vc8-release"

-			IntermediateDirectory="./output/samples-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -541,7 +541,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -890,7 +890,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj
index 8e74da3c..f41950aa 100644
--- a/pjsip-apps/build/samples.vcproj
+++ b/pjsip-apps/build/samples.vcproj
@@ -21,7 +21,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/samples-i386-win32-vc8-release"

-			IntermediateDirectory="./output/samples-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -274,7 +274,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -446,7 +446,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip/build/pjsip_core.vcproj b/pjsip/build/pjsip_core.vcproj
index 293ba100..04ddffc4 100644
--- a/pjsip/build/pjsip_core.vcproj
+++ b/pjsip/build/pjsip_core.vcproj
@@ -19,7 +19,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjsip-core-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjsip-core-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -467,7 +467,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -767,7 +767,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip/build/pjsip_simple.vcproj b/pjsip/build/pjsip_simple.vcproj
index 26fd4854..482e6cad 100644
--- a/pjsip/build/pjsip_simple.vcproj
+++ b/pjsip/build/pjsip_simple.vcproj
@@ -168,7 +168,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="./output/pjsip-simple-i386-win32-vc8-release"

-			IntermediateDirectory="./output/pjsip-simple-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -466,7 +466,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -765,7 +765,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip/build/pjsip_ua.vcproj b/pjsip/build/pjsip_ua.vcproj
index f0e3341f..5be7c6d9 100644
--- a/pjsip/build/pjsip_ua.vcproj
+++ b/pjsip/build/pjsip_ua.vcproj
@@ -19,7 +19,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjsip-ua-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjsip-ua-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -467,7 +467,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -767,7 +767,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip/build/pjsua_lib.vcproj b/pjsip/build/pjsua_lib.vcproj
index 824b3136..35e32061 100644
--- a/pjsip/build/pjsua_lib.vcproj
+++ b/pjsip/build/pjsua_lib.vcproj
@@ -169,7 +169,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pjsua-lib-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pjsua-lib-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -468,7 +468,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -768,7 +768,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/pjsip/build/test_pjsip.vcproj b/pjsip/build/test_pjsip.vcproj
index e3357cba..f4fadb83 100644
--- a/pjsip/build/test_pjsip.vcproj
+++ b/pjsip/build/test_pjsip.vcproj
@@ -19,7 +19,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\test-pjsip-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\test-pjsip-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -535,7 +535,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -881,7 +881,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/third_party/build/g7221/libg7221codec.vcproj b/third_party/build/g7221/libg7221codec.vcproj
index a5fa227d..20939d9f 100644
--- a/third_party/build/g7221/libg7221codec.vcproj
+++ b/third_party/build/g7221/libg7221codec.vcproj
@@ -4,19 +4,23 @@
 	Version="8.00"

 	Name="libg7221codec"

 	ProjectGUID="{2A3F241E-682C-47E1-9543-DC28708B406A}"

+	RootNamespace="libg7221codec"

 	>

 	<Platforms>

 		<Platform

 			Name="Win32"

 		/>

+		<Platform

+			Name="Windows Mobile 6 Standard SDK (ARMV4I)"

+		/>

 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\libg7221codec-i386-win32-vc8-release"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -39,18 +43,19 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

+				Optimization="3"

 				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				PrecompiledHeaderFile=""

-				AssemblerListingLocation=".\output\libg7221codec-i386-win32-vc8-release/"

-				ObjectFile=".\output\libg7221codec-i386-win32-vc8-release/"

-				ProgramDataBaseFileName=".\output\libg7221codec-i386-win32-vc8-release/"

-				WarningLevel="3"

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -89,8 +94,479 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-debug"

-			IntermediateDirectory=".\output\libg7221codec-i386-win32-vc8-debug"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-debug.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-debug/libg7221codec.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release-Dynamic|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release-Static|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+				Optimization="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+				Optimization="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+				Optimization="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug-Static|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

@@ -120,10 +596,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				PrecompiledHeaderFile=""

-				AssemblerListingLocation=".\output\libg7221codec-i386-win32-vc8-debug/"

-				ObjectFile=".\output\libg7221codec-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName=".\output\libg7221codec-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -161,6 +637,206 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				TargetMachine="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug-Dynamic|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-debug.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-debug/libg7221codec.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				TargetMachine="0"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -193,6 +869,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\common\huff_def.h"

@@ -219,6 +931,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\common\huff_tab.h"

@@ -245,6 +993,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\common\tables.h"

@@ -274,6 +1058,42 @@
 								PreprocessorDefinitions=""

 							/>

 						</FileConfiguration>

+						<FileConfiguration

+							Name="Release-Dynamic|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Release-Static|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug-Static|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug-Dynamic|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

 					</File>

 					<File

 						RelativePath="..\..\g7221\common\stl-files\basop32.h"

@@ -300,6 +1120,42 @@
 								PreprocessorDefinitions=""

 							/>

 						</FileConfiguration>

+						<FileConfiguration

+							Name="Release-Dynamic|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Release-Static|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug-Static|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug-Dynamic|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

 					</File>

 					<File

 						RelativePath="..\..\g7221\common\stl-files\count.h"

@@ -335,6 +1191,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\decode\dct4_s.c"

@@ -357,6 +1249,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\decode\dct4_s.h"

@@ -383,6 +1311,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 			</Filter>

 			<Filter

@@ -409,6 +1373,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\encode\dct4_a.h"

@@ -435,6 +1435,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 				<File

 					RelativePath="..\..\g7221\encode\sam2coef.c"

@@ -457,6 +1493,42 @@
 							PreprocessorDefinitions=""

 						/>

 					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Release-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Static|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug-Dynamic|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

 				</File>

 			</Filter>

 		</Filter>

diff --git a/third_party/build/gsm/libgsmcodec.vcproj b/third_party/build/gsm/libgsmcodec.vcproj
index 814ee09f..2dc61a7f 100644
--- a/third_party/build/gsm/libgsmcodec.vcproj
+++ b/third_party/build/gsm/libgsmcodec.vcproj
@@ -53,7 +53,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-debug/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-debug/"

-				WarningLevel="2"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -167,7 +167,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\gsm-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\gsm-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -191,8 +191,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

+				Optimization="3"

 				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../../gsm/inc"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

@@ -202,6 +203,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-release/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-release/"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -347,7 +349,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-debug/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-debug/"

-				WarningLevel="2"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -462,7 +464,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -486,8 +488,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

+				Optimization="3"

 				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../../gsm/inc"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

@@ -497,6 +500,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-release/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-release/"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -643,7 +647,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-debug/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-debug/"

-				WarningLevel="2"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -758,7 +762,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -782,8 +786,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

+				Optimization="3"

 				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

 				AdditionalIncludeDirectories=".,../../gsm/inc"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

@@ -793,6 +798,7 @@
 				AssemblerListingLocation=".\output\gsm-i386-win32-vc8-release/"

 				ObjectFile=".\output\gsm-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-release/"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1960,11 +1966,11 @@
 			Filter="h;hpp;hxx;hm;inl"

 			>

 			<File

-				RelativePath="..\..\gsm\inc\config.h"

+				RelativePath="config.h"

 				>

 			</File>

 			<File

-				RelativePath="config.h"

+				RelativePath="..\..\gsm\inc\config.h"

 				>

 			</File>

 			<File

diff --git a/third_party/build/ilbc/libilbccodec.vcproj b/third_party/build/ilbc/libilbccodec.vcproj
index 0aca8509..edc1fc57 100644
--- a/third_party/build/ilbc/libilbccodec.vcproj
+++ b/third_party/build/ilbc/libilbccodec.vcproj
@@ -52,7 +52,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-debug/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -166,7 +166,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\ilbc-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\ilbc-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -190,8 +190,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

+				Optimization="3"

 				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -200,7 +201,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-release/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -345,7 +346,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-debug/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -460,7 +461,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -494,7 +495,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-release/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -640,7 +641,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-debug/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -755,7 +756,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -789,7 +790,7 @@
 				AssemblerListingLocation=".\output\ilbc-i386-win32-vc8-release/"

 				ObjectFile=".\output\ilbc-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

diff --git a/third_party/build/milenage/libmilenage.vcproj b/third_party/build/milenage/libmilenage.vcproj
index d24a188f..0045383b 100644
--- a/third_party/build/milenage/libmilenage.vcproj
+++ b/third_party/build/milenage/libmilenage.vcproj
@@ -53,7 +53,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-debug/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -167,7 +167,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\../../lib"

-			IntermediateDirectory=".\output/libmilenage-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -202,7 +202,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-release/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -348,7 +348,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-debug/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -463,7 +463,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -498,7 +498,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-release/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -645,7 +645,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-debug/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-debug/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-debug/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 			/>

@@ -760,7 +760,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -795,7 +795,7 @@
 				AssemblerListingLocation=".\output/libmilenage-i386-win32-vc8-release/"

 				ObjectFile=".\output/libmilenage-i386-win32-vc8-release/"

 				ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-release/"

-				WarningLevel="3"

+				WarningLevel="4"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

diff --git a/third_party/build/portaudio/libportaudio.vcproj b/third_party/build/portaudio/libportaudio.vcproj
index 488ccfd4..ff383de6 100644
--- a/third_party/build/portaudio/libportaudio.vcproj
+++ b/third_party/build/portaudio/libportaudio.vcproj
@@ -167,7 +167,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\pa-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\pa-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -463,7 +463,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -760,7 +760,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/third_party/build/resample/libresample.vcproj b/third_party/build/resample/libresample.vcproj
index 3be553bc..03eed82b 100644
--- a/third_party/build/resample/libresample.vcproj
+++ b/third_party/build/resample/libresample.vcproj
@@ -167,7 +167,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\libresample-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\libresample-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -463,7 +463,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -760,7 +760,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/third_party/build/resample/libresample_dll.vcproj b/third_party/build/resample/libresample_dll.vcproj
index a61c21db..7b1e5c0c 100644
--- a/third_party/build/resample/libresample_dll.vcproj
+++ b/third_party/build/resample/libresample_dll.vcproj
@@ -189,7 +189,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\libresample-dll-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\libresample-dll-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -528,7 +528,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -869,7 +869,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/third_party/build/speex/libspeex.vcproj b/third_party/build/speex/libspeex.vcproj
index 1d73f8a0..fe504d94 100644
--- a/third_party/build/speex/libspeex.vcproj
+++ b/third_party/build/speex/libspeex.vcproj
@@ -164,7 +164,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\libspeex-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\libspeex-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -455,7 +455,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -747,7 +747,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

diff --git a/third_party/build/srtp/libsrtp.vcproj b/third_party/build/srtp/libsrtp.vcproj
index bd7a2340..5d12d84c 100644
--- a/third_party/build/srtp/libsrtp.vcproj
+++ b/third_party/build/srtp/libsrtp.vcproj
@@ -158,7 +158,7 @@
 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\output\libsrtp-i386-win32-vc8-release"

-			IntermediateDirectory=".\output\libsrtp-i386-win32-vc8-release"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			WholeProgramOptimization="1"

@@ -431,7 +431,7 @@
 		<Configuration

 			Name="Release-Dynamic|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			WholeProgramOptimization="1"

@@ -705,7 +705,7 @@
 		<Configuration

 			Name="Release-Static|Win32"

 			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			WholeProgramOptimization="1"