Commit 656b0698 authored by Loren Merritt's avatar Loren Merritt

update msvc project files.

patch by anonymous.



git-svn-id: svn://svn.videolan.org/x264/trunk@504 df754926-b1dd-0310-bc7b-ec298dee348c
parent 2f95856b
......@@ -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 \
......
......@@ -25,7 +25,7 @@ CFG=libx264 - Win32 Debug
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=xicl6.exe
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# 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
# 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
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x804 /d "NDEBUG"
# ADD RSC /l 0x804 /d "NDEBUG"
......@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# 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
# 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
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x804 /d "_DEBUG"
# ADD RSC /l 0x804 /d "_DEBUG"
......@@ -323,7 +323,7 @@ InputPath=..\..\common\i386\cpu-a.asm
InputName=cpu-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -335,7 +335,7 @@ InputPath=..\..\common\i386\cpu-a.asm
InputName=cpu-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -354,7 +354,7 @@ InputPath=..\..\common\i386\dct-a.asm
InputName=dct-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -366,7 +366,7 @@ InputPath=..\..\common\i386\dct-a.asm
InputName=dct-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -379,6 +379,10 @@ SOURCE="..\..\common\i386\dct-c.c"
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\predict-c.c"
# End Source File
# Begin Source File
SOURCE=..\..\common\i386\dct.h
# End Source File
# Begin Source File
......@@ -393,7 +397,7 @@ InputPath=..\..\common\i386\mc-a.asm
InputName=mc-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -405,7 +409,7 @@ InputPath=..\..\common\i386\mc-a.asm
InputName=mc-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -424,7 +428,7 @@ InputPath=..\..\common\i386\pixel-a.asm
InputName=pixel-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -436,7 +440,38 @@ InputPath=..\..\common\i386\pixel-a.asm
InputName=pixel-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\pixel-sse2.asm"
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\common\i386\pixel-sse2.asm
InputName=pixel-sse2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\common\i386\pixel-sse2.asm
InputName=pixel-sse2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -455,7 +490,7 @@ InputPath=..\..\common\i386\mc-a2.asm
InputName=mc-a2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -467,7 +502,7 @@ InputPath=..\..\common\i386\mc-a2.asm
InputName=mc-a2
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -486,7 +521,7 @@ InputPath=..\..\common\i386\predict-a.asm
InputName=predict-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -498,7 +533,69 @@ InputPath=..\..\common\i386\predict-a.asm
InputName=predict-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\deblock-a.asm"
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\common\i386\deblock-a.asm
InputName=deblock-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\common\i386\deblock-a.asm
InputName=deblock-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE="..\..\common\i386\quant-a.asm"
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\common\i386\quant-a.asm
InputName=quant-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\common\i386\quant-a.asm
InputName=quant-a
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
nasm -I..\..\common\i386\ -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
# End Custom Build
......@@ -666,6 +763,36 @@ SOURCE=..\..\common\predict.c
# End Source File
# Begin Source File
SOURCE=..\..\common\set.c
!IF "$(CFG)" == "libx264 - Win32 Release"
# PROP Intermediate_Dir "obj/core_release"
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# PROP Intermediate_Dir "obj/core_debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\common\quant.c
!IF "$(CFG)" == "libx264 - Win32 Release"
# PROP Intermediate_Dir "obj/core_release"
!ELSEIF "$(CFG)" == "libx264 - Win32 Debug"
# PROP Intermediate_Dir "obj/core_debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\common\i386\mc-c.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......
......@@ -3,6 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="libx264"
ProjectGUID="{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"
SccProjectName=""
SccLocalPath="">
<Platforms>
......@@ -903,6 +904,40 @@
ProgramDataBaseFileName="obj/core_release/"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\common\i386\predict-c.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
ObjectFile=".\obj/core_release/"
ProgramDataBaseFileName="obj/core_release/"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
ObjectFile=".\obj/core_debug/"
ProgramDataBaseFileName="obj/core_debug/"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
ObjectFile=".\obj/core_release/"
ProgramDataBaseFileName="obj/core_release/"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\common\quant.c">
</File>
......@@ -958,9 +993,6 @@
<Filter
Name="I386"
Filter="*.h,*.c,*-a.asm">
<File
RelativePath="..\..\common\i386\i386inc.asm">
</File>
<File
RelativePath="..\..\common\i386\cpu-a.asm">
<FileConfiguration
......@@ -968,7 +1000,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -977,7 +1009,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -987,7 +1019,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -999,7 +1031,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1008,7 +1040,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1018,7 +1050,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1054,6 +1086,63 @@
<File
RelativePath="..\..\common\i386\dct.h">
</File>
<File
RelativePath="..\..\common\i386\deblock-a.asm">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\common\i386\i386inc.asm">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\common\i386\mc-a.asm">
<FileConfiguration
......@@ -1061,7 +1150,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1070,7 +1159,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1080,7 +1169,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1092,7 +1181,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1101,7 +1190,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1111,7 +1200,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1123,7 +1212,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1132,7 +1221,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1142,7 +1231,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1153,26 +1242,29 @@
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
<File
......@@ -1185,7 +1277,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1194,7 +1286,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1204,7 +1296,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Assembly $(InputPath)"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1215,7 +1307,8 @@
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1223,7 +1316,8 @@
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......@@ -1232,7 +1326,8 @@
ExcludedFromBuild="TRUE">
<Tool
Name="VCCustomBuildTool"
CommandLine="nasm -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
Description="Assembly $(InputPath)"
CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
......
......@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# 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
# 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
# ADD BASE RSC /l 0x804 /d "NDEBUG"
# ADD RSC /l 0x804 /d "NDEBUG"
BSC32=bscmake.exe
......@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# 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
# 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
# ADD BASE RSC /l 0x804 /d "_DEBUG"
# ADD RSC /l 0x804 /d "_DEBUG"
BSC32=bscmake.exe
......@@ -90,5 +90,21 @@ SOURCE=..\..\x264.c
SOURCE=..\..\x264.h
# End Source File
# Begin Source File
SOURCE=..\..\matroska.c
# End Source File
# Begin Source File
SOURCE=..\..\matroska.h
# End Source File
# Begin Source File
SOURCE=..\..\muxers.c
# End Source File
# Begin Source File
SOURCE=..\..\muxers.h
# End Source File
# End Target
# End Project
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libx264", "libx264.vcproj", "{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264", "x264.vcproj", "{22E1814D-7955-4456-AEA5-0C9BA7500792}"
ProjectSection(ProjectDependencies) = postProject
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6} = {A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
Release64 = Release64
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.ActiveCfg = Debug|Win32
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.Build.0 = Debug|Win32
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.ActiveCfg = Release|Win32
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.Build.0 = Release|Win32
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.ActiveCfg = Release64|Win32
{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.Build.0 = Release64|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.ActiveCfg = Debug|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.Build.0 = Debug|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.ActiveCfg = Release|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.Build.0 = Release|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.ActiveCfg = Release64|Win32
{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.Build.0 = Release64|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
......@@ -3,6 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="x264"
ProjectGUID="{22E1814D-7955-4456-AEA5-0C9BA7500792}"
SccProjectName=""
SccLocalPath="">
<Platforms>
......@@ -22,7 +23,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;L:\gpac\include"
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
UsePrecompiledHeader="2"
......@@ -38,7 +39,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_deb\libgpac_static.lib winmm.lib"
AdditionalDependencies="vfw32.lib winmm.lib"
OutputFile="bin/x264.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......@@ -84,7 +85,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;L:\gpac\include"
PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"
PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMXEXT;HAVE_STDINT_H;AVIS_INPUT"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
......@@ -100,7 +101,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_rel\libgpac_static.lib winmm.lib"
AdditionalDependencies="vfw32.lib winmm.lib"
OutputFile="bin/x264.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......@@ -205,6 +206,12 @@
<File
RelativePath="..\..\matroska.h">
</File>
<File
RelativePath="..\..\muxers.c">
</File>
<File
RelativePath="..\..\muxers.h">
</File>
<File
RelativePath="..\..\x264.c">
<FileConfiguration
......
......@@ -24,8 +24,6 @@
#ifndef _FRAME_H
#define _FRAME_H 1
#include <inttypes.h>
typedef struct
{
/* */
......
......@@ -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
......
......@@ -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