shithub: aacenc

Download patch

ref: 15e61552f600d48429f6871cbf544734294d25a3
parent: e03977d2b54016a992ff8c46f16a5891ac99ef80
author: menno <menno>
date: Sat Apr 5 20:51:52 EDT 2008 

Project file fixes


--- a/libfaac/libfaac_dll.sln
+++ b/libfaac/libfaac_dll.sln
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac_dll", "libfaac_dll.vcproj", "{856BB8CF-B944-4D7A-9D59-4945316229AA}"
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug|Win32.Build.0 = Debug|Win32
+		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|Win32.ActiveCfg = Release|Win32
+		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug.ActiveCfg = Debug|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Debug.Build.0 = Debug|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release.ActiveCfg = Release|Win32
-		{856BB8CF-B944-4D7A-9D59-4945316229AA}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/libfaac/libfaac_dll.vcproj
+++ b/libfaac/libfaac_dll.vcproj
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="8,00"
 	Name="libfaac_dll"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{856BB8CF-B944-4D7A-9D59-4945316229AA}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
@@ -15,57 +18,93 @@
 			OutputDirectory=".\ReleaseDLL"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\ReleaseDLL/libfaac_dll.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/libfaac_dll.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile="ReleaseDLL/libfaac.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaac.def"
 				ProgramDatabaseFile=".\ReleaseDLL/libfaac.pdb"
-				ImportLibrary=".\ReleaseDLL/libfaac.lib"/>
+				ImportLibrary=".\ReleaseDLL/libfaac.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\ReleaseDLL/libfaac_dll.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -72,157 +111,224 @@
 			OutputDirectory=".\DebugDLL"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\DebugDLL/libfaac_dll.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/libfaac_dll.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile="DebugDLL/libfaac.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaac.def"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\DebugDLL/libfaac.pdb"
-				ImportLibrary=".\DebugDLL/libfaac.lib"/>
+				ImportLibrary=".\DebugDLL/libfaac.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\DebugDLL/libfaac_dll.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\aacquant.c">
+				RelativePath=".\aacquant.c"
+				>
 			</File>
 			<File
-				RelativePath=".\backpred.c">
+				RelativePath=".\backpred.c"
+				>
 			</File>
 			<File
-				RelativePath=".\bitstream.c">
+				RelativePath=".\bitstream.c"
+				>
 			</File>
 			<File
-				RelativePath=".\channels.c">
+				RelativePath=".\channels.c"
+				>
 			</File>
 			<File
-				RelativePath=".\fft.c">
+				RelativePath=".\fft.c"
+				>
 			</File>
 			<File
-				RelativePath=".\filtbank.c">
+				RelativePath=".\filtbank.c"
+				>
 			</File>
 			<File
-				RelativePath=".\frame.c">
+				RelativePath=".\frame.c"
+				>
 			</File>
 			<File
-				RelativePath=".\huffman.c">
+				RelativePath=".\huffman.c"
+				>
 			</File>
 			<File
-				RelativePath=".\joint.c">
+				RelativePath=".\ltp.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ltp.c">
+				RelativePath=".\midside.c"
+				>
 			</File>
 			<File
-				RelativePath=".\psychiso.c">
+				RelativePath=".\psychkni.c"
+				>
 			</File>
 			<File
-				RelativePath=".\psychkni.c">
+				RelativePath=".\tns.c"
+				>
 			</File>
 			<File
-				RelativePath=".\tns.c">
+				RelativePath=".\util.c"
+				>
 			</File>
-			<File
-				RelativePath=".\util.c">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\aacquant.h">
+				RelativePath=".\aacquant.h"
+				>
 			</File>
 			<File
-				RelativePath=".\backpred.h">
+				RelativePath=".\backpred.h"
+				>
 			</File>
 			<File
-				RelativePath=".\bitstream.h">
+				RelativePath=".\bitstream.h"
+				>
 			</File>
 			<File
-				RelativePath=".\channels.h">
+				RelativePath=".\channels.h"
+				>
 			</File>
 			<File
-				RelativePath=".\coder.h">
+				RelativePath=".\coder.h"
+				>
 			</File>
 			<File
-				RelativePath=".\fft.h">
+				RelativePath=".\fft.h"
+				>
 			</File>
 			<File
-				RelativePath=".\filtbank.h">
+				RelativePath=".\filtbank.h"
+				>
 			</File>
 			<File
-				RelativePath=".\frame.h">
+				RelativePath=".\frame.h"
+				>
 			</File>
 			<File
-				RelativePath=".\huffman.h">
+				RelativePath=".\huffman.h"
+				>
 			</File>
 			<File
-				RelativePath=".\hufftab.h">
+				RelativePath=".\hufftab.h"
+				>
 			</File>
 			<File
-				RelativePath=".\joint.h">
+				RelativePath=".\joint.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ltp.h">
+				RelativePath=".\ltp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\psych.h">
+				RelativePath=".\psych.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tns.h">
+				RelativePath=".\tns.h"
+				>
 			</File>
 			<File
-				RelativePath=".\util.h">
+				RelativePath=".\util.h"
+				>
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\libfaac.def">
+			RelativePath=".\libfaac.def"
+			>
 		</File>
 	</Files>
 	<Globals>
--- a/libfaac/libfaac_dll_drm.sln
+++ b/libfaac/libfaac_dll_drm.sln
@@ -1,27 +1,25 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "libfaac_dll_drm.vcproj", "{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac_dll", "libfaac_dll_drm.vcproj", "{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}"
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug DRM = Debug DRM
-		Release = Release
-		Release DRM = Release DRM
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug DRM|Win32 = Debug DRM|Win32
+		Debug|Win32 = Debug|Win32
+		Release DRM|Win32 = Release DRM|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug.ActiveCfg = Debug|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug.Build.0 = Debug|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug DRM.ActiveCfg = Debug DRM|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug DRM.Build.0 = Debug DRM|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release.ActiveCfg = Release|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release.Build.0 = Release|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release DRM.ActiveCfg = Release DRM|Win32
-		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release DRM.Build.0 = Release DRM|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug DRM|Win32.ActiveCfg = Debug DRM|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug DRM|Win32.Build.0 = Debug DRM|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Debug|Win32.Build.0 = Debug|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release DRM|Win32.ActiveCfg = Release DRM|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release DRM|Win32.Build.0 = Release DRM|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|Win32.ActiveCfg = Release|Win32
+		{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/libfaac/libfaac_dll_drm.vcproj
+++ b/libfaac/libfaac_dll_drm.vcproj
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8,00"
 	Name="libfaac_dll"
 	ProjectGUID="{AA2D0EFE-E73D-40AD-ADCE-8A2B54F34C6F}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
@@ -16,60 +18,89 @@
 			OutputDirectory=".\bin"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\ReleaseDLL/libfaac.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".;../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile="$(OutDir)/libfaac.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaacdrm.def"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\ReleaseDLL/libfaac.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -76,10 +107,32 @@
 			OutputDirectory=".\bin"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\DebugDLL/libfaac.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;../include"
@@ -86,51 +139,59 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				AssemblerListingLocation=""
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile="$(OutDir)/libfaacd.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaacdrm.def"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\DebugDLL/libfaac.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release DRM|Win32"
@@ -137,62 +198,91 @@
 			OutputDirectory=".\bin"
 			IntermediateDirectory=".\ReleaseDRM"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\ReleaseDRM/libfaacdrm.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".;../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile="$(OutDir)/libfaacdrm.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaacdrm.def"
-				SetChecksum="TRUE"
-				TargetMachine="1"/>
+				SetChecksum="true"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\ReleaseDRM/libfaacdrm.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
 				Name="VCWebDeploymentTool"
-				ApplicationProtection="0"/>
+				ApplicationProtection="0"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug DRM|Win32"
@@ -199,10 +289,32 @@
 			OutputDirectory=".\bin"
 			IntermediateDirectory=".\DebugDRM"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\DebugDRMDLL/libfaac.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;../include"
@@ -209,51 +321,59 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFAAC_DLL_EXPORTS;DRM"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				AssemblerListingLocation=""
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile="$(OutDir)/libfaacdrmd.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\libfaacdrm.def"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\DebugDRMDLL/libfaac.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1031"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -261,126 +381,165 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\aacquant.c">
+				RelativePath=".\aacquant.c"
+				>
 			</File>
 			<File
-				RelativePath=".\backpred.c">
+				RelativePath=".\backpred.c"
+				>
 			</File>
 			<File
-				RelativePath=".\bitstream.c">
+				RelativePath=".\bitstream.c"
+				>
 			</File>
 			<File
-				RelativePath=".\channels.c">
+				RelativePath=".\channels.c"
+				>
 			</File>
 			<File
-				RelativePath=".\fft.c">
+				RelativePath=".\fft.c"
+				>
 			</File>
 			<File
-				RelativePath=".\filtbank.c">
+				RelativePath=".\filtbank.c"
+				>
 			</File>
 			<File
-				RelativePath=".\frame.c">
+				RelativePath=".\frame.c"
+				>
 			</File>
 			<File
-				RelativePath=".\huffman.c">
+				RelativePath=".\huffman.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ltp.c">
+				RelativePath=".\ltp.c"
+				>
 			</File>
 			<File
-				RelativePath=".\midside.c">
+				RelativePath=".\midside.c"
+				>
 			</File>
 			<File
-				RelativePath=".\psychkni.c">
+				RelativePath=".\psychkni.c"
+				>
 			</File>
 			<File
-				RelativePath=".\tns.c">
+				RelativePath=".\tns.c"
+				>
 			</File>
 			<File
-				RelativePath=".\util.c">
+				RelativePath=".\util.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\aacquant.h">
+				RelativePath=".\aacquant.h"
+				>
 			</File>
 			<File
-				RelativePath=".\backpred.h">
+				RelativePath=".\backpred.h"
+				>
 			</File>
 			<File
-				RelativePath=".\bitstream.h">
+				RelativePath=".\bitstream.h"
+				>
 			</File>
 			<File
-				RelativePath=".\channels.h">
+				RelativePath=".\channels.h"
+				>
 			</File>
 			<File
-				RelativePath=".\coder.h">
+				RelativePath=".\coder.h"
+				>
 			</File>
 			<File
-				RelativePath=".\fft.h">
+				RelativePath=".\fft.h"
+				>
 			</File>
 			<File
-				RelativePath=".\filtbank.h">
+				RelativePath=".\filtbank.h"
+				>
 			</File>
 			<File
-				RelativePath=".\frame.h">
+				RelativePath=".\frame.h"
+				>
 			</File>
 			<File
-				RelativePath=".\huffman.h">
+				RelativePath=".\huffman.h"
+				>
 			</File>
 			<File
-				RelativePath=".\hufftab.h">
+				RelativePath=".\hufftab.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ltp.h">
+				RelativePath=".\ltp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\midside.h">
+				RelativePath=".\midside.h"
+				>
 			</File>
 			<File
-				RelativePath=".\psych.h">
+				RelativePath=".\psych.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tns.h">
+				RelativePath=".\tns.h"
+				>
 			</File>
 			<File
-				RelativePath=".\util.h">
+				RelativePath=".\util.h"
+				>
 			</File>
 			<File
-				RelativePath=".\version.h">
+				RelativePath=".\version.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="kiss_fft"
-			Filter="">
+			>
 			<File
-				RelativePath=".\kiss_fft\_kiss_fft_guts.h">
+				RelativePath=".\kiss_fft\_kiss_fft_guts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\kiss_fft\kiss_fft.c">
+				RelativePath=".\kiss_fft\kiss_fft.c"
+				>
 			</File>
 			<File
-				RelativePath=".\kiss_fft\kiss_fft.h">
+				RelativePath=".\kiss_fft\kiss_fft.h"
+				>
 			</File>
 			<File
-				RelativePath=".\kiss_fft\kiss_fftr.c">
+				RelativePath=".\kiss_fft\kiss_fftr.c"
+				>
 			</File>
 			<File
-				RelativePath=".\kiss_fft\kiss_fftr.h">
+				RelativePath=".\kiss_fft\kiss_fftr.h"
+				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\include\faac.h">
+			RelativePath="..\include\faac.h"
+			>
 		</File>
 		<File
-			RelativePath="..\include\faaccfg.h">
+			RelativePath="..\include\faaccfg.h"
+			>
 		</File>
 		<File
-			RelativePath=".\libfaacdrm.def">
+			RelativePath=".\libfaacdrm.def"
+			>
 		</File>
 	</Files>
 	<Globals>