Fix MSVC compilation and clean up MSVC build file

Remove Release64 which never worked anyways.

diff --git a/build/win32/libx264.vcproj b/build/win32/libx264.vcproj
index d4036aeb27abcf1ca532a6860e9107ec3bb14047..c28eb63ace45e4332889df4bd005494d0145dd3e 100644 (file)
--- a/build/win32/libx264.vcproj
+++ b/build/win32/libx264.vcproj
@@ -24,7 +24,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="2"\r
                                OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."\r
+                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
                                PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"\r
                                StringPooling="TRUE"\r
                                RuntimeLibrary="4"\r
@@ -74,7 +74,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."\r
+                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
                                PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="5"\r
@@ -113,59 +113,6 @@
                        <Tool\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release64|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="2">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="2"\r
-                               OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."\r
-                               PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"\r
-                               StringPooling="TRUE"\r
-                               RuntimeLibrary="4"\r
-                               EnableFunctionLevelLinking="TRUE"\r
-                               PrecompiledHeaderFile=".\Release/libx264.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               DebugInformationFormat="0"\r
-                               CompileAs="0"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="bin/libx264.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="2052"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
@@ -196,16 +143,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\cabac.c">\r
@@ -230,16 +167,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\cavlc.c">\r
@@ -264,16 +191,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\encoder.c">\r
@@ -298,16 +215,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\macroblock.c">\r
@@ -332,16 +239,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\me.c">\r
@@ -366,16 +263,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\ratecontrol.c">\r
@@ -400,16 +287,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\encoder\set.c">\r
@@ -434,16 +311,6 @@
                                                ObjectFile=".\obj/enc_debug/"\r
                                                ProgramDataBaseFileName="obj/enc_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/enc_release/"\r
-                                               ProgramDataBaseFileName="obj/enc_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <Filter\r
                                Name="enc_h"\r
@@ -491,16 +358,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\common.c">\r
@@ -525,16 +382,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\cpu.c">\r
@@ -559,16 +406,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\dct.c">\r
@@ -593,16 +430,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\vlc.c">\r
@@ -627,16 +454,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\frame.c">\r
@@ -661,16 +478,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\macroblock.c">\r
@@ -695,16 +502,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\x86\mc-c.c">\r
@@ -729,16 +526,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\mc.c">\r
@@ -763,16 +550,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\mdate.c">\r
@@ -797,16 +574,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\pixel.c">\r
@@ -831,16 +598,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\predict.c">\r
@@ -865,16 +622,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\x86\predict-c.c">\r
@@ -899,16 +646,6 @@
                                                ObjectFile=".\obj/core_debug/"\r
                                                ProgramDataBaseFileName="obj/core_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/core_release/"\r
-                                               ProgramDataBaseFileName="obj/core_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\common\quant.c">\r
@@ -925,9 +662,6 @@
                                <File\r
                                        RelativePath="..\..\common\cabac.h">\r
                                </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\clip1.h">\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\common.h">\r
                                </File>\r
@@ -946,12 +680,18 @@
                                <File\r
                                        RelativePath="..\..\common\mc.h">\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\common\osdep.h">\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\pixel.h">\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\predict.h">\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\common\quant.h">\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\set.h">\r
                                </File>\r
@@ -961,9 +701,9 @@
                        </Filter>\r
                        <Filter\r
                                Name="x86"\r
-                               Filter="*.h,*.c,*-a.asm">\r
+                               Filter=".asm">\r
                                <File\r
-                                       RelativePath="..\..\common\x86\cpu-32.asm">\r
+                                       RelativePath="..\..\common\x86\cpu-a.asm">\r
                                        <FileConfiguration\r
                                                Name="Release|Win32">\r
                                                <Tool\r
@@ -980,15 +720,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\dct-32.asm">\r
@@ -1008,20 +739,11 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\common\x86\dct-a.asm">\r
                                        <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\dct-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
+                                               Name="Release|Win32">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
@@ -1036,18 +758,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\dct.h">\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\cabac-a.asm">\r
@@ -1067,14 +777,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\deblock-a.asm">\r
@@ -1094,14 +796,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\x86inc.asm">\r
@@ -1121,14 +815,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\mc-a.asm">\r
@@ -1148,15 +834,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\mc-a2.asm">\r
@@ -1176,15 +853,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\pixel-a.asm">\r
@@ -1204,15 +872,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\pixel-32.asm">\r
@@ -1232,18 +891,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\pixel.h">\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\predict-a.asm">\r
@@ -1263,15 +910,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\quant-a.asm">\r
@@ -1291,15 +929,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\..\common\x86\sad-a.asm">\r
@@ -1319,341 +948,6 @@
                                                        CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -I..\..\common\x86\ -f win32 -O2 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="AMD64"\r
-                               Filter="">\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\amd64inc.asm">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\cpu-64.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\dct-64.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\mc-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\mc-a2.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\pixel-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\predict-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\quant-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               ExcludedFromBuild="TRUE">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"/>\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release64|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       CommandLine="yasm -f win32 -O2 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Dec"\r
-                       Filter=".c">\r
-                       <File\r
-                               RelativePath="..\..\decoder\decoder.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/dec_debug/"\r
-                                               ProgramDataBaseFileName="obj/dec_debug/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\decoder\macroblock.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/dec_debug/"\r
-                                               ProgramDataBaseFileName="obj/dec_debug/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\decoder\set.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/dec_debug/"\r
-                                               ProgramDataBaseFileName="obj/dec_debug/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\decoder\vlc.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/dec_debug/"\r
-                                               ProgramDataBaseFileName="obj/dec_debug/"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32"\r
-                                       ExcludedFromBuild="TRUE">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/dec_release/"\r
-                                               ProgramDataBaseFileName="obj/dec_release/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <Filter\r
-                               Name="dec_h"\r
-                               Filter=".h">\r
-                               <File\r
-                                       RelativePath="..\..\decoder\macroblock.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\decoder\set.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\decoder\vlc.h">\r
                                </File>\r
                        </Filter>\r
                </Filter>\r
@@ -1683,16 +977,6 @@
                                                ObjectFile=".\obj/util_debug/"\r
                                                ProgramDataBaseFileName="obj/util_debug/"/>\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release64|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               ObjectFile=".\obj/util_release/"\r
-                                               ProgramDataBaseFileName="obj/util_release/"/>\r
-                               </FileConfiguration>\r
                        </File>\r
                        <Filter\r
                                Name="extras_h"\r

diff --git a/build/win32/x264.sln b/build/win32/x264.sln
index 548276a83eb6788e82244c7e739d8c6b5b03f655..8fb518d0dcf20fb704b093686309691fc1dd4d8f 100644 (file)
--- a/build/win32/x264.sln
+++ b/build/win32/x264.sln
@@ -12,21 +12,16 @@ Global
        GlobalSection(SolutionConfiguration) = preSolution\r
                Debug = Debug\r
                Release = Release\r
-               Release64 = Release64\r
        EndGlobalSection\r
        GlobalSection(ProjectConfiguration) = postSolution\r
                {22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.ActiveCfg = Debug|Win32\r
                {22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.Build.0 = Debug|Win32\r
                {22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.ActiveCfg = Release|Win32\r
                {22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.Build.0 = Release|Win32\r
-               {22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.ActiveCfg = Release64|Win32\r
-               {22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.Build.0 = Release64|Win32\r
                {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.ActiveCfg = Debug|Win32\r
                {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.Build.0 = Debug|Win32\r
                {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.ActiveCfg = Release|Win32\r
                {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.Build.0 = Release|Win32\r
-               {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.ActiveCfg = Release64|Win32\r
-               {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.Build.0 = Release64|Win32\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/build/win32/x264.vcproj b/build/win32/x264.vcproj
index 78cbdae72c51184e12695ff8203c3022fdffa46d..c5672657dc13eb30d073e921461964b8e4b8716d 100644 (file)
--- a/build/win32/x264.vcproj
+++ b/build/win32/x264.vcproj
@@ -22,7 +22,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;L:\gpac\include"\r
+                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="5"\r
@@ -84,7 +84,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;L:\gpac\include"\r
+                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
                                PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"\r
                                StringPooling="TRUE"\r
                                RuntimeLibrary="0"\r
@@ -133,69 +133,6 @@
                        <Tool\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release64|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="2">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;..\..\..\gpac\include"\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"\r
-                               StringPooling="TRUE"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="TRUE"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderFile=".\obj/x264_Release/x264.pch"\r
-                               AssemblerListingLocation=".\obj/x264_Release/"\r
-                               ObjectFile=".\obj/x264_Release/"\r
-                               ProgramDataBaseFileName=".\obj/x264_Release/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               DebugInformationFormat="0"\r
-                               CompileAs="0"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_rel\libgpac_static.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib bufferoverflowu.lib $(NOINHERIT)"\r
-                               OutputFile="bin/x264.exe"\r
-                               LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               GenerateDebugInformation="FALSE"\r
-                               ProgramDatabaseFile=".\obj/x264_Release/x264.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="0"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TypeLibraryName=".\obj/x264_Release/x264.tlb"\r
-                               HeaderFileName=""/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="2052"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
@@ -231,14 +168,6 @@
                                        AdditionalIncludeDirectories=""\r
                                        PreprocessorDefinitions=""/>\r
                        </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release64|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       Optimization="2"\r
-                                       AdditionalIncludeDirectories=""\r
-                                       PreprocessorDefinitions=""/>\r
-                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\..\x264.h">\r