--- trunk/xvidcore/build/win32/libxvidcore.dsp 2002/09/21 15:16:48 505 +++ trunk/xvidcore/build/win32/libxvidcore.dsp 2004/04/01 11:11:28 1397 @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=libxvidcore - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -17,8 +17,8 @@ !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libxvidcore - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libxvidcore - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libxvidcore - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libxvidcore - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -26,6 +26,7 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "libxvidcore - Win32 Release" @@ -39,17 +40,20 @@ # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "NDEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "ARCH_IS_IA32" /D "WIN32" /D "_WINDOWS" /D "ARCH_IS_32BIT" /YX /FD /Qipo /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc09 /d "NDEBUG" # ADD RSC /l 0xc09 /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\libxvidcore.lib" +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 /nologo /subsystem:windows /dll /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 /nologo /version:1.0 /subsystem:windows /dll /machine:I386 /out:"bin\xvidcore.dll" /implib:"bin\xvidcore.dll.a" !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" @@ -62,17 +66,20 @@ # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 # 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 /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ARCH_IS_32BIT" /D "ARCH_IS_IA32" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc09 /d "_DEBUG" # ADD RSC /l 0xc09 /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\libxvidcore.lib" +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 /nologo /subsystem:windows /dll /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 /nologo /version:1.0 /subsystem:windows /dll /debug /machine:I386 /out:"libxvidcore.dll" /implib:"bin\xvidcore.dll.a" /pdbtype:sept !ENDIF @@ -85,11 +92,11 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\authors.txt +SOURCE=..\..\AUTHORS # End Source File # Begin Source File -SOURCE=..\..\changelog.txt +SOURCE=..\..\ChangeLog # End Source File # Begin Source File @@ -97,19 +104,23 @@ # End Source File # Begin Source File -SOURCE=..\..\gpl.txt +SOURCE="..\..\doc\INSTALL" # End Source File # Begin Source File -SOURCE=..\..\todo.txt +SOURCE=..\..\LICENSE # End Source File # Begin Source File -SOURCE="..\..\doc\xvid-decoding.txt" +SOURCE="..\..\doc\README" # End Source File # Begin Source File -SOURCE="..\..\doc\xvid-encoder.txt" +SOURCE=..\..\README +# End Source File +# Begin Source File + +SOURCE=..\..\TODO # End Source File # End Group # Begin Group "bitstream" @@ -120,6 +131,37 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\src\bitstream\x86_asm\cbp_3dne.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\bitstream\x86_asm\cbp_3dne.asm +InputName=cbp_3dne + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\bitstream\x86_asm\cbp_3dne.asm +InputName=cbp_3dne + +"$(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=..\..\src\bitstream\x86_asm\cbp_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" @@ -226,14 +268,107 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\dct\x86_asm\fdct_mmx.asm +SOURCE=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm +InputName=fdct_mmx_ffmpeg + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm +InputName=fdct_mmx_ffmpeg + +"$(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=..\..\src\dct\x86_asm\fdct_mmx_skal.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm +InputName=fdct_mmx_skal + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm +InputName=fdct_mmx_skal + +"$(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=..\..\src\dct\x86_asm\fdct_sse2_skal.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\dct\x86_asm\fdct_sse2_skal.asm +InputName=fdct_sse2_skal + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\dct\x86_asm\fdct_sse2_skal.asm +InputName=fdct_sse2_skal + +"$(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=..\..\src\dct\x86_asm\idct_3dne.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm -InputName=fdct_mmx +InputPath=..\..\src\dct\x86_asm\idct_3dne.asm +InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -244,8 +379,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm -InputName=fdct_mmx +InputPath=..\..\src\dct\x86_asm\idct_3dne.asm +InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -286,6 +421,68 @@ !ENDIF # End Source File +# Begin Source File + +SOURCE=..\..\src\dct\x86_asm\idct_sse2_dmitry.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\dct\x86_asm\idct_sse2_dmitry.asm +InputName=idct_sse2_dmitry + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\dct\x86_asm\idct_sse2_dmitry.asm +InputName=idct_sse2_dmitry + +"$(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=..\..\src\dct\x86_asm\simple_idct_mmx.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\dct\x86_asm\simple_idct_mmx.asm +InputName=simple_idct_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\dct\x86_asm\simple_idct_mmx.asm +InputName=simple_idct_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File # End Group # Begin Group "dct_h" @@ -307,6 +504,10 @@ SOURCE=..\..\src\dct\idct.c # End Source File +# Begin Source File + +SOURCE=..\..\src\dct\simple_idct.c +# End Source File # End Group # Begin Group "image" @@ -316,29 +517,35 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm +SOURCE=..\..\src\image\x86_asm\colorspace_mmx.inc +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm IntDir=.\Release -InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm -InputName=interpolate8x8_3dn +InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm +InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" # Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm -InputName=interpolate8x8_3dn +InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm +InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build @@ -347,29 +554,31 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm +SOURCE=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm IntDir=.\Release -InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm -InputName=interpolate8x8_mmx +InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm +InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" # Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm -InputName=interpolate8x8_mmx +InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm +InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build @@ -378,14 +587,47 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm +SOURCE=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm IntDir=.\Release -InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm -InputName=interpolate8x8_xmm +InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm +InputName=colorspace_yuyv_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +InputDir=\xvidcore\src\image\x86_asm +IntDir=.\Debug +InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm +InputName=colorspace_yuyv_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm +InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -396,8 +638,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm -InputName=interpolate8x8_xmm +InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm +InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -409,14 +651,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm +SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dne.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm -InputName=rgb_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_3dne.asm +InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -427,8 +669,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm -InputName=rgb_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_3dne.asm +InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -440,14 +682,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm +SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm -InputName=yuv_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm +InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -458,8 +700,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm -InputName=yuv_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm +InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -471,14 +713,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm +SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm -InputName=yuyv_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm +InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -489,8 +731,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm -InputName=yuyv_to_yv12_mmx +InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm +InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -502,14 +744,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm +SOURCE=..\..\src\image\x86_asm\postprocessing_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm -InputName=yv12_to_rgb24_mmx +InputPath=..\..\src\image\x86_asm\postprocessing_mmx.asm +InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -520,8 +762,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm -InputName=yv12_to_rgb24_mmx +InputPath=..\..\src\image\x86_asm\postprocessing_mmx.asm +InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -533,14 +775,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm +SOURCE=..\..\src\image\x86_asm\qpel_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm -InputName=yv12_to_rgb32_mmx +InputPath=..\..\src\image\x86_asm\qpel_mmx.asm +InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -551,8 +793,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm -InputName=yv12_to_rgb32_mmx +InputPath=..\..\src\image\x86_asm\qpel_mmx.asm +InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -564,14 +806,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm +SOURCE=..\..\src\image\x86_asm\reduced_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm -InputName=yv12_to_yuyv_mmx +InputPath=..\..\src\image\x86_asm\reduced_mmx.asm +InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -582,8 +824,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm -InputName=yv12_to_yuyv_mmx +InputPath=..\..\src\image\x86_asm\reduced_mmx.asm +InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -603,12 +845,28 @@ # End Source File # Begin Source File +SOURCE=..\..\src\image\font.h +# End Source File +# Begin Source File + SOURCE=..\..\src\image\image.h # End Source File # Begin Source File SOURCE=..\..\src\image\interpolate8x8.h # End Source File +# Begin Source File + +SOURCE=..\..\src\image\postprocessing.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\qpel.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\reduced.h +# End Source File # End Group # Begin Source File @@ -616,12 +874,28 @@ # End Source File # Begin Source File +SOURCE=..\..\src\image\font.c +# End Source File +# Begin Source File + SOURCE=..\..\src\image\image.c # End Source File # Begin Source File SOURCE=..\..\src\image\interpolate8x8.c # End Source File +# Begin Source File + +SOURCE=..\..\src\image\postprocessing.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\qpel.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\image\reduced.c +# End Source File # End Group # Begin Group "motion" @@ -663,6 +937,37 @@ # End Source File # Begin Source File +SOURCE=..\..\src\motion\x86_asm\sad_3dne.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\motion\x86_asm\sad_3dne.asm +InputName=sad_3dne + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\motion\x86_asm\sad_3dne.asm +InputName=sad_3dne + +"$(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=..\..\src\motion\x86_asm\sad_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" @@ -760,25 +1065,61 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\src\motion\estimation.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\gmc.h +# End Source File +# Begin Source File + SOURCE=..\..\src\motion\motion.h # End Source File # Begin Source File +SOURCE=..\..\src\motion\motion_inlines.h +# End Source File +# Begin Source File + SOURCE=..\..\src\motion\sad.h # End Source File # End Group # Begin Source File -SOURCE=..\..\src\motion\motion_comp.c +SOURCE=..\..\src\motion\estimation_bvop.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\estimation_common.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\estimation_gmc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\estimation_pvop.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\estimation_rd_based.c # End Source File # Begin Source File -SOURCE=..\..\src\motion\motion_est.c +SOURCE=..\..\src\motion\gmc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\motion_comp.c # End Source File # Begin Source File SOURCE=..\..\src\motion\sad.c # End Source File +# Begin Source File + +SOURCE=..\..\src\motion\vop_type_decision.c +# End Source File # End Group # Begin Group "prediction" @@ -804,14 +1145,14 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize4_mmx.asm +SOURCE=..\..\src\quant\x86_asm\quantize_h263_3dne.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm -InputName=quantize4_mmx +InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm +InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -822,8 +1163,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm -InputName=quantize4_mmx +InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm +InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -835,14 +1176,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize_mmx.asm +SOURCE=..\..\src\quant\x86_asm\quantize_h263_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release -InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm -InputName=quantize_mmx +InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm +InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -853,8 +1194,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm -InputName=quantize_mmx +InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm +InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -864,31 +1205,81 @@ !ENDIF # End Source File -# End Group -# Begin Group "quant_h" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\quant\adapt_quant.h -# End Source File -# Begin Source File +SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm +InputName=quantize_mpeg_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm +InputName=quantize_mpeg_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF -SOURCE=..\..\src\quant\quant_h263.h # End Source File # Begin Source File -SOURCE=..\..\src\quant\quant_matrix.h +SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm +InputName=quantize_mpeg_xmm + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm +InputName=quantize_mpeg_xmm + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ENDIF + # End Source File +# End Group +# Begin Group "quant_h" + +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\quant\quant_mpeg4.h +SOURCE=..\..\src\quant\quant.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\src\quant\adapt_quant.c +SOURCE=..\..\src\quant\quant_matrix.h # End Source File +# End Group # Begin Source File SOURCE=..\..\src\quant\quant_h263.c @@ -899,7 +1290,7 @@ # End Source File # Begin Source File -SOURCE=..\..\src\quant\quant_mpeg4.c +SOURCE=..\..\src\quant\quant_mpeg.c # End Source File # End Group # Begin Group "utils" @@ -941,6 +1332,68 @@ # End Source File # Begin Source File +SOURCE=..\..\src\utils\x86_asm\interlacing_mmx.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\utils\x86_asm\interlacing_mmx.asm +InputName=interlacing_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\utils\x86_asm\interlacing_mmx.asm +InputName=interlacing_mmx + +"$(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=..\..\src\utils\x86_asm\mem_transfer_3dne.asm + +!IF "$(CFG)" == "libxvidcore - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\utils\x86_asm\mem_transfer_3dne.asm +InputName=mem_transfer_3dne + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\utils\x86_asm\mem_transfer_3dne.asm +InputName=mem_transfer_3dne + +"$(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=..\..\src\utils\x86_asm\mem_transfer_mmx.asm !IF "$(CFG)" == "libxvidcore - Win32 Release" @@ -1017,10 +1470,6 @@ # End Source File # Begin Source File -SOURCE=..\..\src\utils\ratecontrol.c -# End Source File -# Begin Source File - SOURCE=..\..\src\utils\timer.c # End Source File # End Group @@ -1033,10 +1482,6 @@ # End Source File # Begin Source File -SOURCE=..\..\src\divx4.h -# End Source File -# Begin Source File - SOURCE=..\..\src\encoder.h # End Source File # Begin Source File @@ -1052,13 +1497,41 @@ SOURCE=..\..\src\xvid.h # End Source File # End Group +# Begin Group "plugins" + +# PROP Default_Filter "" +# Begin Group "plugins_h" + +# PROP Default_Filter "" +# End Group # Begin Source File -SOURCE=..\..\src\decoder.c +SOURCE=..\..\src\plugins\plugin_2pass1.c # End Source File # Begin Source File -SOURCE=..\..\src\divx4.c +SOURCE=..\..\src\plugins\plugin_2pass2.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\plugins\plugin_dump.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\plugins\plugin_lumimasking.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\plugins\plugin_psnr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\plugins\plugin_single.c +# End Source File +# End Group +# Begin Source File + +SOURCE=..\..\src\decoder.c # End Source File # Begin Source File @@ -1066,6 +1539,10 @@ # End Source File # Begin Source File +SOURCE=..\generic\libxvidcore.def +# End Source File +# Begin Source File + SOURCE=..\..\src\xvid.c # End Source File # End Target