projects / platform / upstream / libvorbis.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 695af21)
Used Unicode for all platforms.
authorCristian Adam <cristianadam@xiph.org>
Sun, 18 Jan 2009 18:07:40 +0000 (18:07 +0000)
committerCristian Adam <cristianadam@xiph.org>
Sun, 18 Jan 2009 18:07:40 +0000 (18:07 +0000)
svn path=/trunk/vorbis/; revision=15625

win32/VS2005/libvorbis/libvorbis_dynamic.vcproj patch | blob | history
win32/VS2005/libvorbis/libvorbis_static.vcproj patch | blob | history
win32/VS2005/libvorbisfile/libvorbisfile_dynamic.vcproj patch | blob | history
win32/VS2005/libvorbisfile/libvorbisfile_static.vcproj patch | blob | history
win32/VS2005/vorbisdec/vorbisdec_dynamic.vcproj patch | blob | history
win32/VS2005/vorbisdec/vorbisdec_static.vcproj patch | blob | history
win32/VS2005/vorbisenc/vorbisenc_dynamic.vcproj patch | blob | history
win32/VS2005/vorbisenc/vorbisenc_static.vcproj patch | blob | history

diff --git a/win32/VS2005/libvorbis/libvorbis_dynamic.vcproj b/win32/VS2005/libvorbis/libvorbis_dynamic.vcproj
index 6bae148..2030537 100644 (file)
--- a/win32/VS2005/libvorbis/libvorbis_dynamic.vcproj
+++ b/win32/VS2005/libvorbis/libvorbis_dynamic.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="libvorbis"\r
        ProjectGUID="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
        RootNamespace="libvorbis"\r
@@ -33,7 +33,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -117,7 +117,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -202,7 +202,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -280,13 +280,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -302,25 +301,20 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               FavorSizeOrSpeed="1"\r
+                               ExecutionBucket="7"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
-                               StringPooling="true"\r
-                               ExceptionHandling="0"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="false"\r
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               MinimalRebuild="true"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
-                               DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -335,50 +329,46 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib"\r
                                OutputFile="$(OutDir)/libvorbis.dll"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbis.def"\r
-                               GenerateDebugInformation="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/libvorbis.pdb"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="0"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCFxCopTool"\r
+                               Name="VCCodeSignTool"\r
                        />\r
                        <Tool\r
-                               Name="VCAppVerifierTool"\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
+                       <DeploymentTool\r
+                               ForceDirty="-1"\r
+                               RemoteDirectory=""\r
+                               RegisterOutput="0"\r
+                               AdditionalFiles=""\r
                        />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                       <DebuggerTool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
+                       Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -394,26 +384,20 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
+                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               FavorSizeOrSpeed="1"\r
+                               ExecutionBucket="7"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
-                               StringPooling="true"\r
-                               ExceptionHandling="0"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="false"\r
+                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               MinimalRebuild="true"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
-                               DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -428,49 +412,46 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib"\r
                                OutputFile="$(OutDir)/libvorbis.dll"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbis.def"\r
-                               GenerateDebugInformation="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/libvorbis.pdb"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="0"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCFxCopTool"\r
+                               Name="VCCodeSignTool"\r
                        />\r
                        <Tool\r
-                               Name="VCAppVerifierTool"\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
+                       <DeploymentTool\r
+                               ForceDirty="-1"\r
+                               RemoteDirectory=""\r
+                               RegisterOutput="0"\r
+                               AdditionalFiles=""\r
                        />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                       <DebuggerTool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -487,23 +468,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               ExecutionBucket="7"\r
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
                                StringPooling="true"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
@@ -530,39 +510,40 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="0"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCCodeSignTool"\r
+                               Name="VCFxCopTool"\r
                        />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                               Name="VCAppVerifierTool"\r
                        />\r
-                       <DeploymentTool\r
-                               ForceDirty="-1"\r
-                               RemoteDirectory=""\r
-                               RegisterOutput="0"\r
-                               AdditionalFiles=""\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
                        />\r
-                       <DebuggerTool\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Win32"\r
+                       Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -579,6 +560,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -592,7 +574,6 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -622,7 +603,7 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -650,12 +631,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|x64"\r
+                       Name="Release|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -672,24 +653,23 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
+                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               ExecutionBucket="7"\r
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
                                StringPooling="true"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
@@ -716,40 +696,39 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="0"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCFxCopTool"\r
+                               Name="VCCodeSignTool"\r
                        />\r
                        <Tool\r
-                               Name="VCAppVerifierTool"\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
+                       <DeploymentTool\r
+                               ForceDirty="-1"\r
+                               RemoteDirectory=""\r
+                               RegisterOutput="0"\r
+                               AdditionalFiles=""\r
                        />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                       <DebuggerTool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
+                       Name="Release|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -836,12 +815,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Win32"\r
+                       Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -858,23 +837,23 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               ExecutionBucket="7"\r
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
                                StringPooling="true"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
@@ -901,40 +880,39 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="0"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCFxCopTool"\r
+                               Name="VCCodeSignTool"\r
                        />\r
                        <Tool\r
-                               Name="VCAppVerifierTool"\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
+                       <DeploymentTool\r
+                               ForceDirty="-1"\r
+                               RemoteDirectory=""\r
+                               RegisterOutput="0"\r
+                               AdditionalFiles=""\r
                        />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                       <DebuggerTool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|x64"\r
+                       Name="Release_SSE|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -951,7 +929,6 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -965,7 +942,7 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="2"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -995,7 +972,7 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -1023,12 +1000,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
+                       Name="Release_SSE|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1045,23 +1022,24 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="1"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               ExecutionBucket="7"\r
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
                                StringPooling="true"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
@@ -1088,39 +1066,41 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="0"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCCodeSignTool"\r
+                               Name="VCFxCopTool"\r
                        />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                               Name="VCAppVerifierTool"\r
                        />\r
-                       <DeploymentTool\r
-                               ForceDirty="-1"\r
-                               RemoteDirectory=""\r
-                               RegisterOutput="0"\r
-                               AdditionalFiles=""\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
                        />\r
-                       <DebuggerTool\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -1141,15 +1121,21 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                ExecutionBucket="7"\r
-                               Optimization="0"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
-                               MinimalRebuild="true"\r
-                               RuntimeLibrary="1"\r
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
+                               RuntimeLibrary="0"\r
+                               BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
+                               DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -1164,12 +1150,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib"\r
                                OutputFile="$(OutDir)/libvorbis.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbis.def"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/libvorbis.pdb"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
                                TargetMachine="0"\r
                        />\r
@@ -1198,12 +1186,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1290,12 +1278,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE|Windows Mobile 6 Professional SDK (ARMV4I)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1382,12 +1370,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE2|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1404,23 +1392,23 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               ExecutionBucket="7"\r
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
                                StringPooling="true"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
@@ -1447,39 +1435,41 @@
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="0"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCCodeSignTool"\r
+                               Name="VCFxCopTool"\r
                        />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                               Name="VCAppVerifierTool"\r
                        />\r
-                       <DeploymentTool\r
-                               ForceDirty="-1"\r
-                               RemoteDirectory=""\r
-                               RegisterOutput="0"\r
-                               AdditionalFiles=""\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
                        />\r
-                       <DebuggerTool\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE2|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -1495,20 +1485,27 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="1"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               ExecutionBucket="7"\r
-                               Optimization="0"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_)"\r
-                               MinimalRebuild="true"\r
-                               RuntimeLibrary="1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
+                               RuntimeLibrary="0"\r
+                               BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
+                               DisableSpecificWarnings="4244;4100;4267;4189;4305;4127;4706"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -1523,46 +1520,49 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib"\r
                                OutputFile="$(OutDir)/libvorbis.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbis.def"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/libvorbis.pdb"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
                                ImportLibrary="$(OutDir)/libvorbis.lib"\r
-                               TargetMachine="0"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
-                               Name="VCCodeSignTool"\r
+                               Name="VCFxCopTool"\r
                        />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
+                               Name="VCAppVerifierTool"\r
                        />\r
-                       <DeploymentTool\r
-                               ForceDirty="-1"\r
-                               RemoteDirectory=""\r
-                               RegisterOutput="0"\r
-                               AdditionalFiles=""\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
                        />\r
-                       <DebuggerTool\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE2|Windows Mobile 5.0 Pocket PC SDK 2 (ARMV4I)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1649,12 +1649,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       Name="Release_SSE2|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1742,11 +1742,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release_SSE2|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
diff --git a/win32/VS2005/libvorbis/libvorbis_static.vcproj b/win32/VS2005/libvorbis/libvorbis_static.vcproj
index c1b8748..84d444a 100644 (file)
--- a/win32/VS2005/libvorbis/libvorbis_static.vcproj
+++ b/win32/VS2005/libvorbis/libvorbis_static.vcproj
@@ -33,7 +33,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -98,7 +98,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -164,7 +164,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -234,11 +234,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -308,11 +308,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -386,7 +386,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -457,7 +457,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -529,7 +529,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -606,11 +606,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -687,11 +687,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -772,7 +772,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -844,7 +844,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -917,7 +917,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -994,11 +994,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release_SSE|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1075,11 +1075,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release_SSE|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1160,7 +1160,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1232,7 +1232,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1305,7 +1305,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1382,11 +1382,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release_SSE2|Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 5.0 Smartphone SDK 2 (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -1463,11 +1463,11 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release_SSE2|Windows Mobile 6 Professional SDK (ARMV4I)"\r
-                       OutputDirectory="$(SolutionDir)Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
-                       IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
diff --git a/win32/VS2005/libvorbisfile/libvorbisfile_dynamic.vcproj b/win32/VS2005/libvorbisfile/libvorbisfile_dynamic.vcproj
index d6f13d3..50b2bf6 100644 (file)
--- a/win32/VS2005/libvorbisfile/libvorbisfile_dynamic.vcproj
+++ b/win32/VS2005/libvorbisfile/libvorbisfile_dynamic.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="libvorbisfile"\r
        ProjectGUID="{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"\r
        RootNamespace="libvorbisfile"\r
@@ -24,7 +24,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -102,12 +102,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -123,12 +123,16 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
-                               RuntimeLibrary="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -147,15 +151,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/libvorbisfile.dll"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbisfile.def"\r
-                               GenerateDebugInformation="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/libvorbisfile.pdb"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/libvorbisfile.lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -183,12 +186,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -210,7 +213,6 @@
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
                                RuntimeLibrary="0"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -265,12 +267,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Win32"\r
+                       Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -286,13 +288,13 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
                                RuntimeLibrary="0"\r
-                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -319,7 +321,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/libvorbisfile.lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -347,12 +349,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release_SSE|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -368,16 +370,13 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
+                               RuntimeLibrary="0"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -396,14 +395,15 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/libvorbisfile.dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
                                ModuleDefinitionFile="..\..\vorbisfile.def"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/libvorbisfile.pdb"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/libvorbisfile.lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -431,12 +431,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
+                       Name="Release_SSE|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -459,6 +459,7 @@
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
                                RuntimeLibrary="0"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -513,12 +514,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|x64"\r
+                       Name="Release_SSE2|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -534,14 +535,13 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS"\r
                                RuntimeLibrary="0"\r
-                               EnableEnhancedInstructionSet="1"\r
+                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -568,7 +568,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/libvorbisfile.lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -601,7 +601,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -682,7 +682,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_dynamic.vcproj"\r
                />\r
        </References>\r
        <Files>\r
diff --git a/win32/VS2005/libvorbisfile/libvorbisfile_static.vcproj b/win32/VS2005/libvorbisfile/libvorbisfile_static.vcproj
index 962af85..73177bd 100644 (file)
--- a/win32/VS2005/libvorbisfile/libvorbisfile_static.vcproj
+++ b/win32/VS2005/libvorbisfile/libvorbisfile_static.vcproj
@@ -24,7 +24,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -89,7 +89,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -155,7 +155,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -217,7 +217,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -280,7 +280,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -343,7 +343,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -407,7 +407,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -470,7 +470,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -532,7 +532,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_static.vcproj"\r
                />\r
        </References>\r
        <Files>\r
diff --git a/win32/VS2005/vorbisdec/vorbisdec_dynamic.vcproj b/win32/VS2005/vorbisdec/vorbisdec_dynamic.vcproj
index 0f7b379..ce2e9b6 100644 (file)
--- a/win32/VS2005/vorbisdec/vorbisdec_dynamic.vcproj
+++ b/win32/VS2005/vorbisdec/vorbisdec_dynamic.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="vorbisdec"\r
        ProjectGUID="{5833EEA1-1068-431F-A6E5-316E7DC5D90A}"\r
        Keyword="Win32Proj"\r
@@ -23,7 +23,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -100,13 +100,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -122,19 +121,16 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               FavorSizeOrSpeed="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
-                               StringPooling="true"\r
-                               ExceptionHandling="0"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="false"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -154,14 +150,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/vorbisdec.exe"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
-                               GenerateDebugInformation="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/vorbisdec.pdb"\r
                                SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -189,12 +183,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -224,7 +218,6 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -279,12 +272,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Win32"\r
+                       Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -301,6 +294,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -314,7 +308,6 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -341,7 +334,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -369,12 +362,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release_SSE|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -390,16 +384,20 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
+                               RuntimeLibrary="0"\r
+                               BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -419,12 +417,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/vorbisdec.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/vorbisdec.pdb"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="1"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -452,12 +452,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
+                       Name="Release_SSE|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -488,6 +488,7 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -542,12 +543,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|x64"\r
+                       Name="Release_SSE2|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -564,7 +565,6 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -578,7 +578,7 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
+                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -605,7 +605,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -638,7 +638,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -727,7 +727,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_dynamic.vcproj"\r
                />\r
        </References>\r
        <Files>\r
diff --git a/win32/VS2005/vorbisdec/vorbisdec_static.vcproj b/win32/VS2005/vorbisdec/vorbisdec_static.vcproj
index a56f93d..499b630 100644 (file)
--- a/win32/VS2005/vorbisdec/vorbisdec_static.vcproj
+++ b/win32/VS2005/vorbisdec/vorbisdec_static.vcproj
@@ -23,7 +23,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -105,7 +105,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -188,7 +188,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -277,7 +277,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -367,7 +367,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -457,7 +457,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -548,7 +548,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -638,7 +638,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -727,7 +727,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_static.vcproj"\r
                />\r
        </References>\r
        <Files>\r
diff --git a/win32/VS2005/vorbisenc/vorbisenc_dynamic.vcproj b/win32/VS2005/vorbisenc/vorbisenc_dynamic.vcproj
index 059dbcf..b3678c2 100644 (file)
--- a/win32/VS2005/vorbisenc/vorbisenc_dynamic.vcproj
+++ b/win32/VS2005/vorbisenc/vorbisenc_dynamic.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="vorbisenc"\r
        ProjectGUID="{E48B6A8B-F7FE-4DA8-8248-E64DBAC4F56C}"\r
        Keyword="Win32Proj"\r
@@ -23,7 +23,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -101,13 +101,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -123,19 +122,17 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               FavorSizeOrSpeed="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
-                               StringPooling="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="false"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -155,14 +152,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/vorbisenc.exe"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
-                               GenerateDebugInformation="false"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/vorbisenc.pdb"\r
                                SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -190,12 +185,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -225,7 +220,6 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -280,12 +274,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Win32"\r
+                       Name="Release|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -302,6 +296,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -315,7 +310,6 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -342,7 +336,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -370,12 +364,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release_SSE|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -391,17 +386,20 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
+                               StringPooling="true"\r
                                ExceptionHandling="0"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="0"\r
+                               BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -421,12 +419,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="libogg.lib libvorbis.lib"\r
                                OutputFile="$(OutDir)/vorbisenc.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/vorbisenc.pdb"\r
+                               GenerateDebugInformation="false"\r
                                SubSystem="1"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -454,12 +454,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
+                       Name="Release_SSE|x64"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -490,6 +490,7 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -544,12 +545,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE|x64"\r
+                       Name="Release_SSE2|Win32"\r
                        OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -566,7 +567,6 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -580,7 +580,7 @@
                                ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
-                               EnableEnhancedInstructionSet="1"\r
+                               EnableEnhancedInstructionSet="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="false"\r
@@ -607,7 +607,7 @@
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -640,7 +640,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -729,7 +729,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_dynamic.vcproj"\r
                />\r
        </References>\r
        <Files>\r
diff --git a/win32/VS2005/vorbisenc/vorbisenc_static.vcproj b/win32/VS2005/vorbisenc/vorbisenc_static.vcproj
index 2eb71aa..38021c5 100644 (file)
--- a/win32/VS2005/vorbisenc/vorbisenc_static.vcproj
+++ b/win32/VS2005/vorbisenc/vorbisenc_static.vcproj
@@ -23,7 +23,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -106,7 +106,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -190,7 +190,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -279,7 +279,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -369,7 +369,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -459,7 +459,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -550,7 +550,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -640,7 +640,7 @@
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\libogg.vsprops"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -729,7 +729,6 @@
        <References>\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"\r
-                       RelativePathToProject=".\libvorbis\libvorbis_static.vcproj"\r
                />\r
        </References>\r
        <Files>\r
Domain: Multimedia / Media Playback;