Commit 3b2116cd authored by Loren Merritt's avatar Loren Merritt

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
parent d688918e
# 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"