update msvc project files.

patch by anonymous.

git-svn-id: svn://svn.videolan.org/x264/trunk@504 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index e268e921a8282b09ba8a3d642355a67dfa245fd2..8ecd46a13ddd0fb8f10b3671cafc733f25953c62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 
 # MMX/SSE optims
 ifeq ($(ARCH),X86)
-SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
+SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict-c.c
 ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
           common/i386/pixel-a.asm common/i386/mc-a.asm \
           common/i386/mc-a2.asm common/i386/predict-a.asm \
@@ -31,7 +31,7 @@ endif
 
 # MMX/SSE optims
 ifeq ($(ARCH),X86_64)
-SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
+SRCS   += common/i386/mc-c.c common/i386/dct-c.c commoni386/predict-c.c
 ASMSRC  = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
           common/amd64/pixel-a.asm common/amd64/mc-a.asm \
           common/amd64/mc-a2.asm common/amd64/predict-a.asm \

diff --git a/build/win32/libx264.dsp b/build/win32/libx264.dsp
index 215861886c01ea9d9beb4ebb4fb3b33d6c8062ce..d7936c5f9ccd68979062a82d0b66b8966ed6e01a 100644 (file)
--- a/build/win32/libx264.dsp
+++ b/build/win32/libx264.dsp
@@ -25,7 +25,7 @@ CFG=libx264 - Win32 Debug
 # PROP AllowPerConfigDependencies 0\r
 # PROP Scc_ProjName ""\r
 # PROP Scc_LocalPath ""\r
-CPP=xicl6.exe\r
+CPP=cl.exe\r
 RSC=rc.exe\r
 \r
 !IF  "$(CFG)" == "libx264 - Win32 Release"\r
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /G6 /W3 /GX /O2 /Ob2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /c\r
+# ADD CPP /nologo /G6 /W3 /GX /O2 /Ob2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "HAVE_SSE2" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x804 /d "NDEBUG"\r
 # ADD RSC /l 0x804 /d "NDEBUG"\r
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "HAVE_SSE2" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x804 /d "_DEBUG"\r
 # ADD RSC /l 0x804 /d "_DEBUG"\r
@@ -323,7 +323,7 @@ InputPath=..\..\common\i386\cpu-a.asm
 InputName=cpu-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -335,7 +335,7 @@ InputPath=..\..\common\i386\cpu-a.asm
 InputName=cpu-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -354,7 +354,7 @@ InputPath=..\..\common\i386\dct-a.asm
 InputName=dct-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -366,7 +366,7 @@ InputPath=..\..\common\i386\dct-a.asm
 InputName=dct-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -379,6 +379,10 @@ SOURCE="..\..\common\i386\dct-c.c"
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\common\i386\predict-c.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\common\i386\dct.h\r
 # End Source File\r
 # Begin Source File\r
@@ -393,7 +397,7 @@ InputPath=..\..\common\i386\mc-a.asm
 InputName=mc-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -405,7 +409,7 @@ InputPath=..\..\common\i386\mc-a.asm
 InputName=mc-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -424,7 +428,7 @@ InputPath=..\..\common\i386\pixel-a.asm
 InputName=pixel-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -436,7 +440,38 @@ InputPath=..\..\common\i386\pixel-a.asm
 InputName=pixel-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\common\i386\pixel-sse2.asm"\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Release\r
+InputPath=..\..\common\i386\pixel-sse2.asm\r
+InputName=pixel-sse2\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Debug\r
+InputPath=..\..\common\i386\pixel-sse2.asm\r
+InputName=pixel-sse2\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -455,7 +490,7 @@ InputPath=..\..\common\i386\mc-a2.asm
 InputName=mc-a2\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -467,7 +502,7 @@ InputPath=..\..\common\i386\mc-a2.asm
 InputName=mc-a2\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -486,7 +521,7 @@ InputPath=..\..\common\i386\predict-a.asm
 InputName=predict-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -498,7 +533,69 @@ InputPath=..\..\common\i386\predict-a.asm
 InputName=predict-a\r
 \r
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\common\i386\deblock-a.asm"\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Release\r
+InputPath=..\..\common\i386\deblock-a.asm\r
+InputName=deblock-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Debug\r
+InputPath=..\..\common\i386\deblock-a.asm\r
+InputName=deblock-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\..\common\i386\quant-a.asm"\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Release\r
+InputPath=..\..\common\i386\quant-a.asm\r
+InputName=quant-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# Begin Custom Build - Assembly $(InputPath)\r
+IntDir=.\Debug\r
+InputPath=..\..\common\i386\quant-a.asm\r
+InputName=quant-a\r
+\r
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)\r
 \r
 # End Custom Build\r
 \r
@@ -666,6 +763,36 @@ SOURCE=..\..\common\predict.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\common\set.c\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "obj/core_release"\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "obj/core_debug"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\common\quant.c\r
+\r
+!IF  "$(CFG)" == "libx264 - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "obj/core_release"\r
+\r
+!ELSEIF  "$(CFG)" == "libx264 - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "obj/core_debug"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\common\i386\mc-c.c\r
 \r
 !IF  "$(CFG)" == "libx264 - Win32 Release"\r

diff --git a/build/win32/libx264.vcproj b/build/win32/libx264.vcproj
index 50c3bfbf33c30577ddf1d38d6119a64a52bfb605..21d3305901fc54d3f252d9c6d0308d24f7a7a8e3 100644 (file)
--- a/build/win32/libx264.vcproj
+++ b/build/win32/libx264.vcproj
@@ -3,6 +3,7 @@
        ProjectType="Visual C++"\r
        Version="7.10"\r
        Name="libx264"\r
+       ProjectGUID="{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"\r
        SccProjectName=""\r
        SccLocalPath="">\r
        <Platforms>\r
@@ -903,6 +904,40 @@
                                                ProgramDataBaseFileName="obj/core_release/"/>\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\common\i386\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
+                               <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
                        </File>\r
@@ -958,9 +993,6 @@
                        <Filter\r
                                Name="I386"\r
                                Filter="*.h,*.c,*-a.asm">\r
-                               <File\r
-                                       RelativePath="..\..\common\i386\i386inc.asm">\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\i386\cpu-a.asm">\r
                                        <FileConfiguration\r
@@ -968,7 +1000,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -977,7 +1009,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -987,7 +1019,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -999,7 +1031,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1008,7 +1040,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1018,7 +1050,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1054,6 +1086,63 @@
                                <File\r
                                        RelativePath="..\..\common\i386\dct.h">\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\common\i386\deblock-a.asm">\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCustomBuildTool"\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -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="nasm -I..\..\common\i386\ -f win32 -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\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\common\i386\i386inc.asm">\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCustomBuildTool"\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+"\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCustomBuildTool"\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+"\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\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+"\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\common\i386\mc-a.asm">\r
                                        <FileConfiguration\r
@@ -1061,7 +1150,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1070,7 +1159,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1080,7 +1169,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1092,7 +1181,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1101,7 +1190,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1111,7 +1200,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1123,7 +1212,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1132,7 +1221,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1142,7 +1231,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1153,26 +1242,29 @@
                                                Name="Release|Win32">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
                                        <FileConfiguration\r
                                                Name="Release64|Win32"\r
                                                ExcludedFromBuild="TRUE">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
-                                                       Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>\r
+                                                       Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
@@ -1185,7 +1277,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1194,7 +1286,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1204,7 +1296,7 @@
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
                                                        Description="Assembly $(InputPath)"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1215,7 +1307,8 @@
                                                Name="Release|Win32">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1223,7 +1316,8 @@
                                                Name="Debug|Win32">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r
@@ -1232,7 +1326,8 @@
                                                ExcludedFromBuild="TRUE">\r
                                                <Tool\r
                                                        Name="VCCustomBuildTool"\r
-                                                       CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
+                                                       Description="Assembly $(InputPath)"\r
+                                                       CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;\r
 "\r
                                                        Outputs="$(IntDir)\$(InputName).obj"/>\r
                                        </FileConfiguration>\r

diff --git a/build/win32/x264.dsp b/build/win32/x264.dsp
index 9a0e95f2435b9d068b6e68102511e9768f345e83..b524663bfa8ccc5886e3a996a64d711c13c8af7d 100644 (file)
--- a/build/win32/x264.dsp
+++ b/build/win32/x264.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "HAVE_SSE2" /D "HAVE_STDINT_H" /YX /FD /c\r
 # ADD BASE RSC /l 0x804 /d "NDEBUG"\r
 # ADD RSC /l 0x804 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "HAVE_SSE2" /D "HAVE_STDINT_H" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x804 /d "_DEBUG"\r
 # ADD RSC /l 0x804 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -90,5 +90,21 @@ SOURCE=..\..\x264.c
 \r
 SOURCE=..\..\x264.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\matroska.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\matroska.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\muxers.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\muxers.h\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/build/win32/x264.sln b/build/win32/x264.sln
new file mode 100644 (file)
index 0000000..548276a
--- /dev/null
+++ b/build/win32/x264.sln
@@ -0,0 +1,35 @@
+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
+               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
+       GlobalSection(ExtensibilityAddIns) = postSolution\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/build/win32/x264.vcproj b/build/win32/x264.vcproj
index b103db8e351022b71ca902153c49768eb6368ef0..517c7db7fabaf23f33ccbe3f3f5130e7ed2c6f52 100644 (file)
--- a/build/win32/x264.vcproj
+++ b/build/win32/x264.vcproj
@@ -3,6 +3,7 @@
        ProjectType="Visual C++"\r
        Version="7.10"\r
        Name="x264"\r
+       ProjectGUID="{22E1814D-7955-4456-AEA5-0C9BA7500792}"\r
        SccProjectName=""\r
        SccLocalPath="">\r
        <Platforms>\r
@@ -22,7 +23,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;L:\gpac\include"\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="5"\r
                                UsePrecompiledHeader="2"\r
@@ -38,7 +39,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_deb\libgpac_static.lib winmm.lib"\r
+                               AdditionalDependencies="vfw32.lib winmm.lib"\r
                                OutputFile="bin/x264.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
@@ -84,7 +85,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;L:\gpac\include"\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT"\r
                                StringPooling="TRUE"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="TRUE"\r
@@ -100,7 +101,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_rel\libgpac_static.lib winmm.lib"\r
+                               AdditionalDependencies="vfw32.lib winmm.lib"\r
                                OutputFile="bin/x264.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
@@ -205,6 +206,12 @@
                <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

diff --git a/common/frame.h b/common/frame.h
index e682569a04195076213e626c78c23b8da71bdb9f..2eedff72c104e872788f35a6426c1083f6c04783 100644 (file)
--- a/common/frame.h
+++ b/common/frame.h
@@ -24,8 +24,6 @@
 #ifndef _FRAME_H
 #define _FRAME_H 1
 
-#include <inttypes.h>
-
 typedef struct
 {
     /* */

diff --git a/common/i386/predict.c b/common/i386/predict-c.c
similarity index 100%
rename from common/i386/predict.c
rename to common/i386/predict-c.c

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index df58121223831e8533e4aac03d384a1504f5888c..c0b12cf30529f4df6650c10876a140ef6dc5ee29 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -50,7 +50,6 @@
 #define sqrtf sqrt
 #endif
 #ifdef WIN32 // POSIX says that rename() removes the destination, but win32 doesn't.
-#include <unistd.h>
 #define rename(src,dst) (unlink(dst), rename(src,dst))
 #endif
 

diff --git a/encoder/rdo.c b/encoder/rdo.c
index 480d5ec489a5bb2e869249bb0381ff5525d2f4ae..b45c1c7be74df038fbfc7002ea2b794e8c684471 100644 (file)
--- a/encoder/rdo.c
+++ b/encoder/rdo.c
@@ -182,7 +182,7 @@ int x264_rd_cost_i4x4( x264_t *h, int i_lambda2, int i4, int i_mode )
  * Trellis RD quantization
  ****************************************************************************/
 
-#define TRELLIS_SCORE_MAX (1ULL<<50)
+#define TRELLIS_SCORE_MAX ((uint64_t)1<<50)
 #define CABAC_SIZE_BITS 8
 #define SSD_WEIGHT_BITS 5
 #define LAMBDA_BITS 4