ref: a934198bf10d73d88f2a557f49744a60d371e284
parent: 7de750134aef4f2ef38b7c975f02aeff540dffef
author: menno <menno>
date: Wed Aug 22 14:31:50 EDT 2007
Updated project files to VS2005 and made everything compile again
--- a/common/mp4v2/rtphint.cpp
+++ b/common/mp4v2/rtphint.cpp
@@ -325,7 +325,7 @@
*ppEncodingParams = NULL;
if (m_pRtpMapProperty) {
pRtpMap = m_pRtpMapProperty->GetValue();
- pSlash = strchr(pRtpMap, '/');
+ pSlash = strchr((char*)pRtpMap, '/');
if (pSlash) {
length = pSlash - pRtpMap;
--- a/frontend/faac.sln
+++ b/frontend/faac.sln
@@ -1,35 +1,36 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "faac", "faac.vcproj", "{5A62E361-2050-4639-A5F4-402D87E1AB88}"
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "faac", "faac.vcproj", "{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C7A305F1-8C73-4E1F-BB1B-623707D44D24} = {C7A305F1-8C73-4E1F-BB1B-623707D44D24}
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65} = {9CC48C6E-92EB-4814-AD37-97AB3622AB65}
+ EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "..\LIBFAAC\libfaac.vcproj", "{AB72465E-EE03-4901-AA3D-5B5503DFB381}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "..\LIBFAAC\libfaac.vcproj", "{9CC48C6E-92EB-4814-AD37-97AB3622AB65}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "..\common\libsndfile\Win32\libsndfile.vcproj", "{6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4v2_st", "..\common\mp4v2\libmp4v2_st60.vcproj", "{C7A305F1-8C73-4E1F-BB1B-623707D44D24}"
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
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.0 = {6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.1 = {AB72465E-EE03-4901-AA3D-5B5503DFB381}
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Debug|Win32.Build.0 = Debug|Win32
+ {92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|Win32.ActiveCfg = Release|Win32
+ {92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}.Release|Win32.Build.0 = Release|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|Win32.Build.0 = Debug|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|Win32.ActiveCfg = Release|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|Win32.Build.0 = Release|Win32
+ {C7A305F1-8C73-4E1F-BB1B-623707D44D24}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C7A305F1-8C73-4E1F-BB1B-623707D44D24}.Debug|Win32.Build.0 = Debug|Win32
+ {C7A305F1-8C73-4E1F-BB1B-623707D44D24}.Release|Win32.ActiveCfg = Release|Win32
+ {C7A305F1-8C73-4E1F-BB1B-623707D44D24}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.Debug.ActiveCfg = Debug|Win32
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.Debug.Build.0 = Debug|Win32
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.Release.ActiveCfg = Release|Win32
- {5A62E361-2050-4639-A5F4-402D87E1AB88}.Release.Build.0 = Release|Win32
- {AB72465E-EE03-4901-AA3D-5B5503DFB381}.Debug.ActiveCfg = Debug|Win32
- {AB72465E-EE03-4901-AA3D-5B5503DFB381}.Debug.Build.0 = Debug|Win32
- {AB72465E-EE03-4901-AA3D-5B5503DFB381}.Release.ActiveCfg = Release|Win32
- {AB72465E-EE03-4901-AA3D-5B5503DFB381}.Release.Build.0 = Release|Win32
- {6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}.Debug.ActiveCfg = Debug|Win32
- {6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}.Debug.Build.0 = Debug|Win32
- {6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}.Release.ActiveCfg = Release|Win32
- {6B162CF2-E6E2-4D50-8F27-F0B51C81B78E}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
--- a/frontend/faac.vcproj
+++ b/frontend/faac.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="faac"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{92992E74-AEDE-46DC-AD8C-ADEA876F1A4C}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -15,54 +18,90 @@
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\Debug/faac.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include,../common/libsndfile/src,../common/getopt"
+ AdditionalIncludeDirectories="../include;../common/mp4v2;../common/getopt"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- UsePrecompiledHeader="2"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/faac.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib"
OutputFile=".\Debug/faac.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/faac.pdb"
- SubSystem="1"/>
+ SubSystem="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/faac.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -69,83 +108,122 @@
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
+ 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"
+ TypeLibraryName=".\Release/faac.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../common/libsndfile/src,../common/getopt"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
- StringPooling="TRUE"
- RuntimeLibrary="4"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/faac.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib"
OutputFile=".\Release/faac.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/faac.pdb"
- SubSystem="1"/>
+ SubSystem="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/faac.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"/>
+ 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="..\common\getopt\getopt.c">
+ RelativePath=".\input.c"
+ >
</File>
<File
- RelativePath=".\main.c">
+ RelativePath=".\main.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="..\..\..\..\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H">
+ RelativePath="..\include\faac.h"
+ >
</File>
<File
- RelativePath="..\include\faac.h">
+ RelativePath=".\getopt.h"
+ >
</File>
<File
- RelativePath="..\common\getopt\getopt.h">
- </File>
- <File
- RelativePath="..\..\..\..\Program Files\Microsoft Visual Studio\VC98\Include\sndfile.h">
- </File>
- <File
- RelativePath="..\common\libsndfile\src\sndfile.h">
+ RelativePath=".\input.h"
+ >
</File>
</Filter>
</Files>
--- a/frontend/faacgui.sln
+++ b/frontend/faacgui.sln
@@ -1,35 +1,26 @@
-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}") = "faacgui", "faacgui.vcproj", "{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65} = {9CC48C6E-92EB-4814-AD37-97AB3622AB65}
+ EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "..\libfaac\libfaac.vcproj", "{D21FD35A-0307-40E6-A342-500119C031E0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaac", "..\libfaac\libfaac.vcproj", "{9CC48C6E-92EB-4814-AD37-97AB3622AB65}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "..\common\libsndfile\Win32\libsndfile.vcproj", "{38B256F4-8335-4044-9647-ED992CBC1E61}"
-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
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.0 = {38B256F4-8335-4044-9647-ED992CBC1E61}
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.1 = {D21FD35A-0307-40E6-A342-500119C031E0}
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug|Win32.Build.0 = Debug|Win32
+ {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|Win32.ActiveCfg = Release|Win32
+ {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release|Win32.Build.0 = Release|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9CC48C6E-92EB-4814-AD37-97AB3622AB65}.Release|Win32.ActiveCfg = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug.ActiveCfg = Debug|Win32
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Debug.Build.0 = Debug|Win32
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release.ActiveCfg = Release|Win32
- {B4FD0E50-5379-48C3-8D3E-D948A8921CA8}.Release.Build.0 = Release|Win32
- {D21FD35A-0307-40E6-A342-500119C031E0}.Debug.ActiveCfg = Debug|Win32
- {D21FD35A-0307-40E6-A342-500119C031E0}.Debug.Build.0 = Debug|Win32
- {D21FD35A-0307-40E6-A342-500119C031E0}.Release.ActiveCfg = Release|Win32
- {D21FD35A-0307-40E6-A342-500119C031E0}.Release.Build.0 = Release|Win32
- {38B256F4-8335-4044-9647-ED992CBC1E61}.Debug.ActiveCfg = Debug|Win32
- {38B256F4-8335-4044-9647-ED992CBC1E61}.Debug.Build.0 = Debug|Win32
- {38B256F4-8335-4044-9647-ED992CBC1E61}.Release.ActiveCfg = Release|Win32
- {38B256F4-8335-4044-9647-ED992CBC1E61}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
--- a/frontend/faacgui.vcproj
+++ b/frontend/faacgui.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="faacgui"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{B4FD0E50-5379-48C3-8D3E-D948A8921CA8}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -15,58 +18,94 @@
OutputDirectory=".\DebugGUI"
IntermediateDirectory=".\DebugGUI"
ConfigurationType="1"
+ 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=".\DebugGUI/faacgui.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include,../common/libsndfile/src"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- UsePrecompiledHeader="2"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\DebugGUI/faacgui.pch"
AssemblerListingLocation=".\DebugGUI/"
ObjectFile=".\DebugGUI/"
ProgramDataBaseFileName=".\DebugGUI/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="Comdlg32.lib advapi32.lib shell32.lib gdi32.lib odbc32.lib odbccp32.lib winmm.lib ws2_32.lib user32.lib"
OutputFile=".\DebugGUI/faacgui.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\DebugGUI/faacgui.pdb"
- SubSystem="2"/>
+ SubSystem="2"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\DebugGUI/faacgui.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -73,88 +112,139 @@
OutputDirectory=".\ReleaseGUI"
IntermediateDirectory=".\ReleaseGUI"
ConfigurationType="1"
+ 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=".\ReleaseGUI/faacgui.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../common/libsndfile/src"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
- StringPooling="TRUE"
- RuntimeLibrary="4"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\ReleaseGUI/faacgui.pch"
AssemblerListingLocation=".\ReleaseGUI/"
ObjectFile=".\ReleaseGUI/"
ProgramDataBaseFileName=".\ReleaseGUI/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="Comdlg32.lib advapi32.lib shell32.lib gdi32.lib odbc32.lib odbccp32.lib winmm.lib ws2_32.lib user32.lib"
OutputFile=".\ReleaseGUI/faacgui.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ProgramDatabaseFile=".\ReleaseGUI/faacgui.pdb"
- SubSystem="2"/>
+ SubSystem="2"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\ReleaseGUI/faacgui.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"/>
+ 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=".\maingui.c">
+ RelativePath=".\input.c"
+ >
</File>
+ <File
+ RelativePath=".\maingui.c"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="..\..\..\..\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H">
+ RelativePath="..\..\..\..\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H"
+ >
</File>
<File
- RelativePath="..\include\faac.h">
+ RelativePath="..\include\faac.h"
+ >
</File>
<File
- RelativePath=".\resource.h">
+ RelativePath=".\resource.h"
+ >
</File>
<File
- RelativePath="..\common\libsndfile\src\sndfile.h">
+ RelativePath="..\common\libsndfile\src\sndfile.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
<File
- RelativePath=".\faacgui.rc">
+ RelativePath=".\faacgui.rc"
+ >
</File>
</Filter>
</Files>
--- a/libfaac/libfaac.vcproj
+++ b/libfaac/libfaac.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"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{9CC48C6E-92EB-4814-AD37-97AB3622AB65}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -15,43 +18,73 @@
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="4"
+ 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"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- UsePrecompiledHeader="2"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/libfaac.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="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile=".\Debug\libfaac.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1043"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -58,140 +91,198 @@
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="4"
+ 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"
+ />
+ <Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- OptimizeForProcessor="2"
+ AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/libfaac.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1043"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile=".\Release\libfaac.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1043"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ 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>
</Files>
--
⑨