rm msvc project files and related ifdefs

diff --git a/build/win32/libx264.vcproj b/build/win32/libx264.vcproj
deleted file mode 100644 (file)
index 8497a35..0000000
--- a/build/win32/libx264.vcproj
+++ /dev/null
@@ -1,995 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="7.10"\r
-       Name="libx264"\r
-       ProjectGUID="{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"\r
-       SccProjectName=""\r
-       SccLocalPath="">\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"/>\r
-       </Platforms>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\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;../../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
-                               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
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="2">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
-                               PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="5"\r
-                               PrecompiledHeaderFile=".\Debug/libx264.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               DebugInformationFormat="3"\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="_DEBUG"\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
-       <Files>\r
-               <Filter\r
-                       Name="Enc"\r
-                       Filter=".c">\r
-                       <File\r
-                               RelativePath="..\..\encoder\analyse.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\cabac.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\cavlc.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\encoder.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\macroblock.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\me.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\ratecontrol.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\encoder\set.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/enc_debug/"\r
-                                               ProgramDataBaseFileName="obj/enc_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <Filter\r
-                               Name="enc_h"\r
-                               Filter=".h">\r
-                               <File\r
-                                       RelativePath="..\..\encoder\analyse.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\encoder\macroblock.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\encoder\me.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\encoder\ratecontrol.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\encoder\set.h">\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Core"\r
-                       Filter=".c;.h;">\r
-                       <File\r
-                               RelativePath="..\..\common\cabac.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\common.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\cpu.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\dct.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\vlc.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\frame.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\macroblock.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\x86\mc-c.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\mc.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\mdate.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\pixel.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\predict.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\x86\predict-c.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/core_debug/"\r
-                                               ProgramDataBaseFileName="obj/core_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\quant.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\common\set.c">\r
-                       </File>\r
-                       <Filter\r
-                               Name="core_h"\r
-                               Filter=".h">\r
-                               <File\r
-                                       RelativePath="..\..\common\bs.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\cabac.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\common.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\cpu.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\dct.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\frame.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\common\macroblock.h">\r
-                               </File>\r
-                               <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
-                               <File\r
-                                       RelativePath="..\..\common\vlc.h">\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="x86"\r
-                               Filter=".asm">\r
-                               <File\r
-                                       RelativePath="..\..\common\x86\cpu-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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\cabac-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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\x86inc.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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\predict-a.asm">\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-                                       <FileConfiguration\r
-                                               Name="Release|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Assembly $(InputPath)"\r
-                                                       CommandLine="yasm -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
-               <Filter\r
-                       Name="extras"\r
-                       Filter=".c">\r
-                       <File\r
-                               RelativePath="..\..\extras\getopt.c">\r
-                               <FileConfiguration\r
-                                       Name="Release|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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BasicRuntimeChecks="3"\r
-                                               ObjectFile=".\obj/util_debug/"\r
-                                               ProgramDataBaseFileName="obj/util_debug/"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <Filter\r
-                               Name="extras_h"\r
-                               Filter=".h">\r
-                               <File\r
-                                       RelativePath="..\..\extras\getopt.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\extras\stdint.h">\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r

diff --git a/build/win32/x264.sln b/build/win32/x264.sln
deleted file mode 100644 (file)
index 8fb518d..0000000
--- a/build/win32/x264.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libx264", "libx264.vcproj", "{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264", "x264.vcproj", "{22E1814D-7955-4456-AEA5-0C9BA7500792}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6} = {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}\r
-       EndProjectSection\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfiguration) = preSolution\r
-               Debug = Debug\r
-               Release = Release\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
-               {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
-       EndGlobalSection\r
-       GlobalSection(ExtensibilityGlobals) = postSolution\r
-       EndGlobalSection\r
-       GlobalSection(ExtensibilityAddIns) = postSolution\r
-       EndGlobalSection\r
-EndGlobal\r

diff --git a/build/win32/x264.vcproj b/build/win32/x264.vcproj
deleted file mode 100644 (file)
index c567265..0000000
--- a/build/win32/x264.vcproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="7.10"\r
-       Name="x264"\r
-       ProjectGUID="{22E1814D-7955-4456-AEA5-0C9BA7500792}"\r
-       SccProjectName=""\r
-       SccLocalPath="">\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"/>\r
-       </Platforms>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory=".\obj/x264_Debug"\r
-                       IntermediateDirectory=".\obj/x264_Debug"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="2">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../../common;../../extras;../.."\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="5"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderFile=".\obj/x264_Debug/x264.pch"\r
-                               AssemblerListingLocation=".\obj/x264_Debug/"\r
-                               ObjectFile=".\obj/x264_Debug/"\r
-                               ProgramDataBaseFileName=".\obj/x264_Debug/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="vfw32.lib winmm.lib"\r
-                               OutputFile="bin/x264.exe"\r
-                               LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile=".\obj/x264_Debug/x264.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TypeLibraryName=".\obj/x264_Debug/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="_DEBUG"\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
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\obj/x264_Release"\r
-                       IntermediateDirectory=".\obj/x264_Release"\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;../../extras;../.."\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"\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
-                               CompileAs="0"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="vfw32.lib winmm.lib"\r
-                               OutputFile="bin/x264.exe"\r
-                               LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               ProgramDatabaseFile=".\obj/x264_Release/x264.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\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
-       <Files>\r
-               <File\r
-                       RelativePath="..\..\matroska.c">\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\matroska.h">\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\muxers.c">\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\muxers.h">\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\x264.c">\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       Optimization="0"\r
-                                       AdditionalIncludeDirectories=""\r
-                                       PreprocessorDefinitions=""\r
-                                       BasicRuntimeChecks="3"/>\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release|Win32">\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       Optimization="2"\r
-                                       AdditionalIncludeDirectories=""\r
-                                       PreprocessorDefinitions=""/>\r
-                       </FileConfiguration>\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\x264.h">\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r

diff --git a/common/mdate.c b/common/mdate.c
index 1a02cdf56c383c8c7174251c2c51d32ab8028017..7a1c8a5c396672a3ab9965459c063838956c9ee6 100644 (file)
--- a/common/mdate.c
+++ b/common/mdate.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#if !(defined(_MSC_VER) || defined(__MINGW32__))
+#ifndef __MINGW32__
 #include <sys/time.h>
 #else
 #include <sys/types.h>
@@ -31,9 +31,8 @@
 
 int64_t x264_mdate( void )
 {
-#if !(defined(_MSC_VER) || defined(__MINGW32__))
+#ifndef __MINGW32__
     struct timeval tv_date;
-
     gettimeofday( &tv_date, NULL );
     return( (int64_t) tv_date.tv_sec * 1000000 + (int64_t) tv_date.tv_usec );
 #else

diff --git a/common/osdep.h b/common/osdep.h
index 71780a24f1abc7ceb00dcc6eba340da48a705bc7..194990b83f24968e439414c18cd27abff6ec62d3 100644 (file)
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -39,19 +39,6 @@
 #include <fcntl.h> // _O_BINARY
 #endif
 
-#ifdef _MSC_VER
-#define inline __inline
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#define snprintf _snprintf
-#define fseek _fseeki64
-#define ftell _ftelli64
-#define isfinite _finite
-#define strtok_r strtok_s
-#define _CRT_SECURE_NO_DEPRECATE
-#define X264_VERSION "" // no configure script for msvc
-#endif
-
 #if (defined(SYS_OPENBSD) && !defined(isfinite)) || defined(SYS_SunOS)
 #define isfinite finite
 #endif
@@ -62,11 +49,7 @@
 #endif
 #endif
 
-#ifdef _MSC_VER
-#define DECLARE_ALIGNED( var, n ) __declspec(align(n)) var
-#else
 #define DECLARE_ALIGNED( var, n ) var __attribute__((aligned(n)))
-#endif
 #define ALIGNED_16( var ) DECLARE_ALIGNED( var, 16 )
 #define ALIGNED_8( var )  DECLARE_ALIGNED( var, 8 )
 #define ALIGNED_4( var )  DECLARE_ALIGNED( var, 4 )
@@ -161,7 +144,7 @@ static inline int x264_pthread_create( x264_pthread_t *t, void *a, void *(*f)(vo
 #define WORD_SIZE sizeof(void*)
 
 #if !defined(_WIN64) && !defined(__LP64__)
-#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
 #define BROKEN_STACK_ALIGNMENT /* define it if stack is not mod16 */
 #endif
 #endif

diff --git a/doc/standards.txt b/doc/standards.txt
index 4ebb165a476cd9832272e01a522461b6ccba796a..db9a69178056ddff139f547b8241bb51db75ff06 100644 (file)
--- a/doc/standards.txt
+++ b/doc/standards.txt
@@ -1,5 +1,5 @@
-x264 is written in C. The particular variant of C is: intersection of gcc-2.95 and msvc. This means C89 + a few C99 features.
-The extra utilities (mostly checkasm) are written in C99, with no attempt at compatibility with old compilers.
+x264 is written in C. The particular variant of C is: intersection of C99 and gcc>=3.4.
+checkasm is written in gcc, with no attempt at compatibility with anything else.
 
 We make the following additional assumptions which are true of real systems but not guaranteed by C99:
 * Two's complement.

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 44e8d742477206d3884cb0aa9c8757470c8615d0..2c02af24e1d059ba27702446a895144743baecf7 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -24,9 +24,7 @@
 
 #define _ISOC99_SOURCE
 #include <math.h>
-#ifndef _MSC_VER
 #include <unistd.h>
-#endif
 
 #include "common/common.h"
 #include "common/cpu.h"

diff --git a/encoder/set.c b/encoder/set.c
index 49ca340e4facc41681ae8d1688989c8911ce0074..f6dd83035b297af0860edb67b1e3e4ff0c0080c2 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -24,9 +24,7 @@
 #include <math.h>
 
 #include "common/common.h"
-#ifndef _MSC_VER
 #include "config.h"
-#endif
 #include "set.h"
 
 #define bs_write_ue bs_write_ue_big

diff --git a/extras/getopt.c b/extras/getopt.c
index d2dbd306d891b81be282331873c637c5934d2fd9..4c0cb1014c5711ce03e6c8f177bcd0341a81e9a0 100644 (file)
--- a/extras/getopt.c
+++ b/extras/getopt.c
@@ -202,11 +202,7 @@ static char *posixly_correct;
 # if HAVE_STRING_H
 #  include <string.h>
 # else
-#  ifdef _MSC_VER
-#   include <string.h>
-#  else
-#   include <strings.h>
-#  endif
+#  include <strings.h>
 # endif
 
 /* Avoid depending on library functions or files
@@ -984,21 +980,6 @@ getopt (argc, argv, optstring)
                           0);
 }
 
-#ifdef _MSC_VER
-
-int
-getopt_long (argc, argv, optstring, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *long_options;
-     int *opt_index;
-{
-  return _getopt_internal (argc, argv, optstring, long_options, opt_index, 0);
-}
-
-#endif
-
 #endif /* Not ELIDE_CODE.  */
 \f
 #ifdef TEST

diff --git a/muxers.c b/muxers.c
index 7100877edf0c9e931a4deb3184c5287b4da68d7c..c9b8dfa24c70fd232a8a5c88063fd120e2d2e296 100644 (file)
--- a/muxers.c
+++ b/muxers.c
@@ -25,10 +25,7 @@
 #include "x264.h"
 #include "matroska.h"
 #include "muxers.h"
-
-#ifndef _MSC_VER
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 

diff --git a/x264.c b/x264.c
index ec4a3782deeb1ad6a2a6e02ff7d991c12f5369db..ab76a9385c6ff8d7c8ccd8db8e8648dba893eb6b 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -32,10 +32,7 @@
 #include "common/cpu.h"
 #include "x264.h"
 #include "muxers.h"
-
-#ifndef _MSC_VER
 #include "config.h"
-#endif
 
 #ifdef _WIN32
 #include <windows.h>