projects / platform / upstream / flac.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Version 1.3.0pre4.
[platform/upstream/flac.git] / src / libFLAC / libFLAC_dynamic.vcproj
diff --git a/src/libFLAC/libFLAC_dynamic.vcproj b/src/libFLAC/libFLAC_dynamic.vcproj
index 45b475f..258d0b1 100644 (file)
--- a/src/libFLAC/libFLAC_dynamic.vcproj
+++ b/src/libFLAC/libFLAC_dynamic.vcproj
@@ -17,7 +17,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\obj\debug\lib"\r
+                       OutputDirectory="..\..\objs\debug\lib"\r
                        IntermediateDirectory="Debug_dynamic"\r
                        ConfigurationType="2"\r
                        >\r
@@ -40,14 +40,15 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.1.4\&quot;;DEBUG;FLAC__OVERFLOW_DETECT"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.3.0pre4\&quot;;DEBUG;FLAC__OVERFLOW_DETECT"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="0"\r
                                DisableSpecificWarnings="4267;4996"\r
                        />\r
                        <Tool\r
@@ -61,9 +62,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\obj\release\lib\ogg_static.lib"\r
+                               AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"\r
                                LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="uuid.lib"\r
+                               IgnoreDefaultLibraryNames="uuid.lib;libcmt.lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -87,15 +88,12 @@
                                Name="VCAppVerifierTool"\r
                        />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\obj\release\lib"\r
+                       OutputDirectory="..\..\objs\release\lib"\r
                        IntermediateDirectory="Release_dynamic"\r
                        ConfigurationType="2"\r
                        >\r
@@ -116,13 +114,19 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               EnableIntrinsicFunctions="true"\r
+                               FavorSizeOrSpeed="1"\r
+                               OmitFramePointers="true"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories=".\include;..\..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.1.4\&quot;"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\&quot;1.3.0pre4\&quot;;FLaC__INLINE=_inline"\r
+                               RuntimeLibrary="0"\r
+                               BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="0"\r
                                DisableSpecificWarnings="4267;4996"\r
                        />\r
                        <Tool\r
@@ -136,13 +140,14 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\obj\release\lib\ogg_static.lib"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="..\..\objs\release\lib\libogg_static.lib"\r
+                               LinkIncremental="1"\r
                                IgnoreDefaultLibraryNames="uuid.lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -164,9 +169,6 @@
                                Name="VCAppVerifierTool"\r
                        />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
@@ -180,11 +182,11 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
-                               RelativePath=".\include\protected\all.h"\r
+                               RelativePath=".\include\private\all.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\private\all.h"\r
+                               RelativePath=".\include\protected\all.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -403,6 +405,30 @@
                        </File>\r
                </Filter>\r
                <File\r
+                       RelativePath=".\ia32\bitreader_asm.nasm"\r
+                       >\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj&#x0D;&#x0A;"\r
+                                       AdditionalDependencies="ia32/bitreader_asm.nasm;ia32/nasm.h"\r
+                                       Outputs="ia32/bitreader_asm.obj"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj&#x0D;&#x0A;"\r
+                                       AdditionalDependencies="ia32/bitreader_asm.nasm;ia32/nasm.h"\r
+                                       Outputs="ia32/bitreader_asm.obj"\r
+                               />\r
+                       </FileConfiguration>\r
+               </File>\r
+               <File\r
                        RelativePath=".\release_static\BuildLog.htm"\r
                        >\r
                </File>\r
@@ -414,7 +440,7 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/cpu_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/cpu_asm.obj"\r
                                />\r
@@ -424,7 +450,7 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/cpu_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/cpu_asm.obj"\r
                                />\r
@@ -438,7 +464,7 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/fixed_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/fixed_asm.obj"\r
                                />\r
@@ -448,7 +474,7 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/fixed_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/fixed_asm.obj"\r
                                />\r
@@ -462,7 +488,7 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/lpc_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/lpc_asm.obj"\r
                                />\r
@@ -472,12 +498,36 @@
                                >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj&#x0D;&#x0A;"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj&#x0D;&#x0A;"\r
                                        AdditionalDependencies="ia32/lpc_asm.nasm;ia32/nasm.h"\r
                                        Outputs="ia32/lpc_asm.obj"\r
                                />\r
                        </FileConfiguration>\r
                </File>\r
+               <File\r
+                       RelativePath=".\ia32\stream_encoder_asm.nasm"\r
+                       >\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj&#x0D;&#x0A;"\r
+                                       AdditionalDependencies="ia32/stream_encoder_asm.nasm;ia32/nasm.h"\r
+                                       Outputs="ia32/stream_encoder_asm.obj"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                                       CommandLine="nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj&#x0D;&#x0A;"\r
+                                       AdditionalDependencies="ia32/stream_encoder_asm.nasm;ia32/nasm.h"\r
+                                       Outputs="ia32/stream_encoder_asm.obj"\r
+                               />\r
+                       </FileConfiguration>\r
+               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
Domain: Multimedia / Audio FW;