From 3b2116cdd0aceff59036a17c6f9aa32592de4851 Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Wed, 16 Feb 2005 04:59:21 +0000 Subject: [PATCH] Some defines needed by MSVC, and convert the DSP files to DOS-style newlines. Patch by Radek Czyz. git-svn-id: svn://svn.videolan.org/x264/trunk@128 df754926-b1dd-0310-bc7b-ec298dee348c --- build/win32/libx264.dsp | 1575 +++++++++++++++++++-------------------- build/win32/x264.dsp | 188 ++--- common/common.h | 4 + vfw/codec.c | 1 - 4 files changed, 879 insertions(+), 889 deletions(-) diff --git a/build/win32/libx264.dsp b/build/win32/libx264.dsp index ed046adb..60b9abb4 100644 --- a/build/win32/libx264.dsp +++ b/build/win32/libx264.dsp @@ -1,794 +1,781 @@ -# Microsoft Developer Studio Project File - Name="libx264" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libx264 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libx264.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libx264.mak" CFG="libx264 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libx264 - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libx264 - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# 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 /W3 /GX /O2 /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" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x804 /d "NDEBUG" -# ADD RSC /l 0x804 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"bin/libx264.lib" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# 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" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x804 /d "_DEBUG" -# ADD RSC /l 0x804 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"bin/libx264.lib" - -!ENDIF - -# Begin Target - -# Name "libx264 - Win32 Release" -# Name "libx264 - Win32 Debug" -# Begin Group "Enc" - -# PROP Default_Filter ".c" -# Begin Group "enc_h" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=..\..\encoder\analyse.h -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\macroblock.h -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\me.h -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\ratecontrol.h -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\set.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\encoder\analyse.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\cabac.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\cavlc.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\encoder.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\macroblock.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\me.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\ratecontrol.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\eval.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\encoder\set.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/enc_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/enc_debug" - -!ENDIF - -# End Source File -# End Group -# Begin Group "Core" - -# PROP Default_Filter ".c;.h;" -# Begin Group "core_h" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=..\..\common\bs.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\cabac.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\clip1.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\common.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\cpu.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\csp.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\dct.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\frame.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\macroblock.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\mc.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\pixel.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\predict.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\set.h -# End Source File -# Begin Source File - -SOURCE=..\..\common\vlc.h -# End Source File -# End Group -# Begin Group "I386" - -# PROP Default_Filter "*.h,*.c,*-a.asm" -# Begin Source File - -SOURCE=..\..\common\i386\cpu-a.asm - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# Begin Custom Build - Assembly $(InputPath) -IntDir=.\Release -InputPath=..\..\common\i386\cpu-a.asm -InputName=cpu - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -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\cpu-a.asm -InputName=cpu - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\..\common\i386\dct-c.c" -# End Source File -# Begin Source File - -SOURCE=..\..\common\i386\dct-a.asm - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# Begin Custom Build - Assembly $(InputPath) -IntDir=.\Release -InputPath=..\..\common\i386\dct-a.asm -InputName=dct - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -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\dct-a.asm -InputName=dct - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\common\i386\dct.h -# End Source File -# Begin Source File - -SOURCE="..\..\common\i386\mc-c.c" - -!IF "$(CFG)" == "libx264 - Win32 Release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\common\i386\mc-a.asm - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# Begin Custom Build - Assembly $(InputPath) -IntDir=.\Release -InputPath=..\..\common\i386\mc-a.asm -InputName=mc - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -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\mc-a.asm -InputName=mc - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\common\i386\pixel-a.asm - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# Begin Custom Build - Assembly $(InputPath) -IntDir=.\Release -InputPath=..\..\common\i386\pixel-a.asm -InputName=pixel - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -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-a.asm -InputName=pixel - -"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\common\i386\pixel.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\common\cabac.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\common.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\cpu.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\csp.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\dct.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\frame.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\macroblock.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\mc.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\mdate.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\pixel.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\predict.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 -# End Group -# Begin Group "Dec" - -# PROP Default_Filter ".c" -# Begin Group "dec_h" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=..\..\decoder\macroblock.h - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\decoder\set.h - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\decoder\vlc.h - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\decoder\decoder.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\decoder\macroblock.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\decoder\set.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\decoder\vlc.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/dec_release" -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/dec_debug" -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Group "extras" - -# PROP Default_Filter ".c" -# Begin Group "extras_h" - -# PROP Default_Filter ".h" -# Begin Source File - -SOURCE=..\..\extras\getopt.h - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/util_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/util_debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\extras\stdint.h - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/util_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/util_debug" - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\extras\getopt.c - -!IF "$(CFG)" == "libx264 - Win32 Release" - -# PROP Intermediate_Dir "obj/util_release" - -!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" - -# PROP Intermediate_Dir "obj/util_debug" - -!ENDIF - -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libx264" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libx264 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libx264.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libx264.mak" CFG="libx264 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libx264 - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libx264 - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=xicl6.exe +RSC=rc.exe + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# 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 +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x804 /d "NDEBUG" +# ADD RSC /l 0x804 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"bin/libx264.lib" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# 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 +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x804 /d "_DEBUG" +# ADD RSC /l 0x804 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"bin/libx264.lib" + +!ENDIF + +# Begin Target + +# Name "libx264 - Win32 Release" +# Name "libx264 - Win32 Debug" +# Begin Group "Enc" + +# PROP Default_Filter ".c" +# Begin Group "enc_h" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\..\encoder\analyse.h +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\macroblock.h +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\me.h +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\ratecontrol.h +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\set.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\encoder\analyse.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\cabac.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\cavlc.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\encoder.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\eval.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\macroblock.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\me.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\ratecontrol.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\encoder\set.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/enc_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/enc_debug" + +!ENDIF + +# End Source File +# End Group +# Begin Group "Core" + +# PROP Default_Filter ".c;.h;" +# Begin Group "core_h" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\..\common\bs.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\cabac.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\clip1.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\common.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\cpu.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\csp.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\dct.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\frame.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\macroblock.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\mc.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\pixel.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\predict.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\set.h +# End Source File +# Begin Source File + +SOURCE=..\..\common\vlc.h +# End Source File +# End Group +# Begin Group "I386" + +# PROP Default_Filter "*.h,*.c,*-a.asm" +# Begin Source File + +SOURCE="..\..\common\i386\cpu-a.asm" + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# Begin Custom Build - Assembly $(InputPath) +IntDir=.\Release +InputPath=..\..\common\i386\cpu-a.asm +InputName=cpu-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -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\cpu-a.asm +InputName=cpu-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE="..\..\common\i386\dct-a.asm" + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# Begin Custom Build - Assembly $(InputPath) +IntDir=.\Release +InputPath=..\..\common\i386\dct-a.asm +InputName=dct-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -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\dct-a.asm +InputName=dct-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE="..\..\common\i386\dct-c.c" +# End Source File +# Begin Source File + +SOURCE=..\..\common\i386\dct.h +# End Source File +# Begin Source File + +SOURCE="..\..\common\i386\mc-a.asm" + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# Begin Custom Build - Assembly $(InputPath) +IntDir=.\Release +InputPath=..\..\common\i386\mc-a.asm +InputName=mc-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -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\mc-a.asm +InputName=mc-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE="..\..\common\i386\pixel-a.asm" + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# Begin Custom Build - Assembly $(InputPath) +IntDir=.\Release +InputPath=..\..\common\i386\pixel-a.asm +InputName=pixel-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -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-a.asm +InputName=pixel-a + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\common\i386\pixel.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\common\cabac.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\common.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\cpu.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\csp.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\dct.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\frame.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\macroblock.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\mc.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\mdate.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\pixel.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\predict.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 +# End Group +# Begin Group "Dec" + +# PROP Default_Filter ".c" +# Begin Group "dec_h" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\..\decoder\macroblock.h + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\decoder\set.h + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\decoder\vlc.h + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" + +!ENDIF + +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\decoder\decoder.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\decoder\macroblock.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\decoder\set.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\decoder\vlc.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/dec_release" +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/dec_debug" +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# End Group +# Begin Group "extras" + +# PROP Default_Filter ".c" +# Begin Group "extras_h" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\..\extras\getopt.h + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/util_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/util_debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\extras\stdint.h + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/util_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/util_debug" + +!ENDIF + +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\extras\getopt.c + +!IF "$(CFG)" == "libx264 - Win32 Release" + +# PROP Intermediate_Dir "obj/util_release" + +!ELSEIF "$(CFG)" == "libx264 - Win32 Debug" + +# PROP Intermediate_Dir "obj/util_debug" + +!ENDIF + +# End Source File +# End Group +# End Target +# End Project diff --git a/build/win32/x264.dsp b/build/win32/x264.dsp index 4b7d59bd..9a0e95f2 100644 --- a/build/win32/x264.dsp +++ b/build/win32/x264.dsp @@ -1,94 +1,94 @@ -# Microsoft Developer Studio Project File - Name="x264" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=x264 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "x264.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "x264.mak" CFG="x264 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "x264 - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "x264 - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "x264 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "obj/x264_Release" -# PROP Intermediate_Dir "obj/x264_Release" -# 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 BASE RSC /l 0x804 /d "NDEBUG" -# ADD RSC /l 0x804 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/x264.exe" - -!ELSEIF "$(CFG)" == "x264 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "obj/x264_Debug" -# PROP Intermediate_Dir "obj/x264_Debug" -# 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 BASE RSC /l 0x804 /d "_DEBUG" -# ADD RSC /l 0x804 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/x264.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "x264 - Win32 Release" -# Name "x264 - Win32 Debug" -# Begin Source File - -SOURCE=..\..\x264.c -# End Source File -# Begin Source File - -SOURCE=..\..\x264.h -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="x264" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=x264 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "x264.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "x264.mak" CFG="x264 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "x264 - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "x264 - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "x264 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "obj/x264_Release" +# PROP Intermediate_Dir "obj/x264_Release" +# 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 BASE RSC /l 0x804 /d "NDEBUG" +# ADD RSC /l 0x804 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/x264.exe" + +!ELSEIF "$(CFG)" == "x264 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "obj/x264_Debug" +# PROP Intermediate_Dir "obj/x264_Debug" +# 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 BASE RSC /l 0x804 /d "_DEBUG" +# ADD RSC /l 0x804 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/x264.exe" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "x264 - Win32 Release" +# Name "x264 - Win32 Debug" +# Begin Source File + +SOURCE=..\..\x264.c +# End Source File +# Begin Source File + +SOURCE=..\..\x264.h +# End Source File +# End Target +# End Project diff --git a/common/common.h b/common/common.h index b9ef408d..441c913d 100644 --- a/common/common.h +++ b/common/common.h @@ -31,6 +31,10 @@ #endif #include +#ifdef _MSC_VER +#define snprintf _snprintf +#endif + #include "x264.h" #include "bs.h" #include "set.h" diff --git a/vfw/codec.c b/vfw/codec.c index 281281c5..d558a26b 100644 --- a/vfw/codec.c +++ b/vfw/codec.c @@ -26,7 +26,6 @@ #include /* debug only */ #include -#include #define X264_MAX(a,b) ( (a)>(b) ? (a) : (b) ) -- 2.40.0