From: Michael Jerris <mike@jerris.com>
Date: Mon, 24 Sep 2007 14:30:01 +0000 (+0000)
Subject: an attempt at fixing FSCORE-50
X-Git-Tag: v1.0-beta2~613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62d4165ab3ea4d01a023e2501e567c68370bead;p=thirdparty%2Ffreeswitch.git

an attempt at fixing FSCORE-50

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5747 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/libs/portaudio/build/msvc/portaudio.vcproj b/libs/portaudio/build/msvc/portaudio.vcproj
index eca6ef0ea6..7854c90b80 100644
--- a/libs/portaudio/build/msvc/portaudio.vcproj
+++ b/libs/portaudio/build/msvc/portaudio.vcproj
@@ -49,8 +49,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="0"
+				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS"
 				StringPooling="true"
@@ -96,10 +96,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Debug|Win32"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -118,82 +118,66 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug_x86/portaudio.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
+				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib"
-				TargetMachine="17"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="4"
+			Name="Debug DirectSound|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -223,7 +207,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -247,11 +231,22 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\portaudio.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
+				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -263,14 +258,20 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release DirectSound|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -290,35 +291,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release_x86/portaudio.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
+				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -326,14 +327,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
-				LinkIncremental="2"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib"
-				TargetMachine="17"
+				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
+				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -347,7 +347,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -363,9 +363,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -385,35 +385,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_x86/portaudio.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Release_x86/portaudio.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
+				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -421,14 +421,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="2"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\portaudio.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
+				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
+				ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -442,7 +441,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -458,7 +457,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug DirectSound|x64"
+			Name="Debug|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
@@ -553,9 +552,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release DirectSound|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug DirectSound|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -575,35 +574,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release_x86/portaudio.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug_x86/portaudio.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch"
+				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch"
 				AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\"
 				ObjectFile="$(PlatformName)\$(ConfigurationName)\"
 				ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -611,13 +610,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"
-				LinkIncremental="1"
+				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\portaudio.def"
-				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb"
-				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib"
-				TargetMachine="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb"
+				ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -631,7 +631,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc"
+				OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -764,7 +764,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -773,7 +773,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -782,7 +782,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -791,7 +791,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -800,7 +800,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -809,7 +809,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -840,7 +840,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -849,7 +849,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -858,7 +858,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -867,7 +867,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -876,7 +876,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -885,7 +885,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -916,7 +916,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -925,7 +925,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -934,7 +934,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -943,7 +943,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -952,7 +952,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -961,7 +961,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -992,7 +992,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1001,7 +1001,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1010,7 +1010,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1019,7 +1019,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1028,7 +1028,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1037,7 +1037,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1068,7 +1068,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1077,7 +1077,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1086,7 +1086,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1095,7 +1095,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1104,7 +1104,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1113,7 +1113,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1144,7 +1144,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1153,7 +1153,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1162,7 +1162,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1171,7 +1171,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1180,7 +1180,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1189,7 +1189,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1220,7 +1220,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1229,7 +1229,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1238,7 +1238,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1247,7 +1247,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1256,7 +1256,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1265,7 +1265,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1296,7 +1296,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1305,7 +1305,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1314,7 +1314,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1323,7 +1323,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1332,7 +1332,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1341,7 +1341,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1372,7 +1372,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1381,7 +1381,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1390,7 +1390,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1399,7 +1399,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1408,7 +1408,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1417,7 +1417,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1448,7 +1448,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1457,7 +1457,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1466,7 +1466,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release DirectSound|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1475,7 +1475,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|Win32"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1484,7 +1484,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug DirectSound|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1493,7 +1493,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release DirectSound|Win32"
+						Name="Debug DirectSound|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1532,7 +1532,8 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1541,8 +1542,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1551,7 +1551,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1560,7 +1560,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1569,7 +1569,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1578,7 +1578,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -1613,7 +1613,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1622,8 +1623,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1632,7 +1632,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1641,7 +1641,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1650,7 +1650,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1659,7 +1659,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1691,7 +1691,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1700,8 +1701,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1710,7 +1710,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1719,7 +1719,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1728,7 +1728,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1737,7 +1737,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1769,7 +1769,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1778,8 +1779,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1788,7 +1788,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1797,7 +1797,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1806,7 +1806,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1815,7 +1815,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1847,7 +1847,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1856,8 +1857,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1866,7 +1866,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1875,7 +1875,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1884,7 +1884,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1893,7 +1893,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1925,7 +1925,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1934,8 +1935,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1944,7 +1944,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1953,7 +1953,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1962,7 +1962,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -1971,7 +1971,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2003,7 +2003,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2012,8 +2013,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2022,7 +2022,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2031,7 +2031,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2040,7 +2040,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2049,7 +2049,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2081,7 +2081,8 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release|x64"
+								Name="Debug|Win32"
+								ExcludedFromBuild="true"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2090,8 +2091,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
+								Name="Debug DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2100,7 +2100,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug|x64"
+								Name="Release DirectSound|Win32"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2109,7 +2109,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|Win32"
+								Name="Release|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2118,7 +2118,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Debug DirectSound|x64"
+								Name="Debug|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2127,7 +2127,7 @@
 								/>
 							</FileConfiguration>
 							<FileConfiguration
-								Name="Release DirectSound|Win32"
+								Name="Debug DirectSound|x64"
 								>
 								<Tool
 									Name="VCCLCompilerTool"
@@ -2164,7 +2164,8 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2173,8 +2174,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2183,7 +2183,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2192,7 +2192,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2201,7 +2201,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2210,7 +2210,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2242,7 +2242,8 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2251,8 +2252,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2261,7 +2261,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2270,7 +2270,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2279,7 +2279,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2288,7 +2288,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2323,7 +2323,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2332,7 +2332,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2341,7 +2341,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2350,7 +2350,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2359,7 +2359,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2368,7 +2368,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2404,7 +2404,8 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
+							ExcludedFromBuild="true"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2413,8 +2414,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2423,7 +2423,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2432,7 +2432,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2441,7 +2441,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2450,7 +2450,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2489,7 +2489,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2498,7 +2498,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2507,7 +2507,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2516,7 +2516,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2525,7 +2525,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2534,7 +2534,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2565,7 +2565,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2574,7 +2574,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2583,7 +2583,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2592,7 +2592,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2601,7 +2601,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2610,7 +2610,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2641,7 +2641,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|x64"
+							Name="Debug|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2650,7 +2650,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|Win32"
+							Name="Debug DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2659,7 +2659,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
+							Name="Release DirectSound|Win32"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2668,7 +2668,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|Win32"
+							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2677,7 +2677,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug DirectSound|x64"
+							Name="Debug|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
@@ -2686,7 +2686,7 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release DirectSound|Win32"
+							Name="Debug DirectSound|x64"
 							>
 							<Tool
 								Name="VCCLCompilerTool"
diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
index 416342be1b..5daa5dfe5d 100644
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
+++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
@@ -127,6 +127,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\portaudio\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS"
 				RuntimeLibrary="2"
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
index c2f4db1416..49dbdf8a90 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
@@ -194,19 +194,36 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath=".\mod_sofia.c"></File>
-			<File RelativePath=".\sofia_reg.c"></File>
-			<File RelativePath=".\sofia_glue.c"></File>
-			<File RelativePath=".\sofia_presence.c"></File>
-			<File RelativePath=".\sofia.c"></File>
-			
+			<File
+				RelativePath=".\mod_sofia.c"
+				>
+			</File>
+			<File
+				RelativePath=".\sofia.c"
+				>
+			</File>
+			<File
+				RelativePath=".\sofia_glue.c"
+				>
+			</File>
+			<File
+				RelativePath=".\sofia_presence.c"
+				>
+			</File>
+			<File
+				RelativePath=".\sofia_reg.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File RelativePath=".\mod_sofia.h"></File>
+			<File
+				RelativePath=".\mod_sofia.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"