--- branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp 2003/10/27 01:03:06 1190 +++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp 2004/02/06 11:27:43 1352 @@ -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=xicl6.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "libxvidcore - Win32 Release" @@ -39,18 +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 /G6 /W3 /GX /Op /Ob2 /D "NDEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /D "WIN32" /D "_MBCS" /D "_LIB" /FAcs /YX /FD /O3 -QxK /Qunroll /c -# SUBTRACT CPP /Z /Fr +# 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=xilink6.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" @@ -63,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 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /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=xilink6.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 @@ -86,15 +92,11 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\doc\_API_.txt +SOURCE=..\..\AUTHORS # End Source File # Begin Source File -SOURCE=..\..\authors.txt -# End Source File -# Begin Source File - -SOURCE=..\..\changelog.txt +SOURCE=..\..\ChangeLog # End Source File # Begin Source File @@ -102,11 +104,7 @@ # End Source File # Begin Source File -SOURCE=..\..\gpl.txt -# End Source File -# Begin Source File - -SOURCE=..\..\INSTALL +SOURCE="..\..\doc\INSTALL" # End Source File # Begin Source File @@ -114,19 +112,15 @@ # End Source File # Begin Source File -SOURCE=..\..\README.txt -# End Source File -# Begin Source File - -SOURCE=..\..\todo.txt +SOURCE="..\..\doc\README" # End Source File # Begin Source File -SOURCE="..\..\doc\xvid-decoding.txt" +SOURCE=..\..\README # End Source File # Begin Source File -SOURCE="..\..\doc\xvid-encoder.txt" +SOURCE=..\..\TODO # End Source File # End Group # Begin Group "bitstream" @@ -281,7 +275,7 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm -InputName=fdct_mmx +InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -293,7 +287,7 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm -InputName=fdct_mmx +InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -312,7 +306,7 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Release InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm -InputName=fdct_xmm +InputName=fdct_mmx_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) @@ -324,7 +318,38 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm -InputName=fdct_xmm +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) @@ -398,6 +423,37 @@ # 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" @@ -470,26 +526,26 @@ !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) -InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\src\image\x86_asm IntDir=.\Release InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -I"$(InputDir)" -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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\src\image\x86_asm IntDir=.\Debug InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -I"$(InputDir)" -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build @@ -503,26 +559,26 @@ !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) -InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\image\x86_asm IntDir=.\Release InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -I"$(InputDir)" -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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\src\image\x86_asm IntDir=.\Debug InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -f win32 -DPREFIX -I"$(InputDir)" -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build @@ -536,26 +592,26 @@ !IF "$(CFG)" == "libxvidcore - Win32 Release" # Begin Custom Build - Assembling $(InputPath) -InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\src\image\x86_asm IntDir=.\Release 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) + 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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\ +InputDir=..\..\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) + nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) # End Custom Build @@ -692,7 +748,7 @@ !IF "$(CFG)" == "libxvidcore - Win32 Release" -# Begin Custom Build +# Begin Custom Build - Assembling $(InputPath) IntDir=.\Release InputPath=..\..\src\image\x86_asm\qpel_mmx.asm InputName=qpel_mmx @@ -704,6 +760,16 @@ !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +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) + +# End Custom Build + !ENDIF # End Source File @@ -760,6 +826,14 @@ # 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 @@ -781,6 +855,10 @@ # 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 @@ -1036,14 +1114,14 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_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\quantize_mpeg_mmx.asm -InputName=quantize_mpeg_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) @@ -1054,8 +1132,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm -InputName=quantize_mpeg_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) @@ -1067,14 +1145,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_xmm.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_mpeg_xmm.asm -InputName=quantize_mpeg_xmm +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) @@ -1085,8 +1163,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm -InputName=quantize_mpeg_xmm +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) @@ -1098,14 +1176,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize_h263_3dne.asm +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_h263_3dne.asm -InputName=quantize_h263_3dne +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) @@ -1116,8 +1194,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm -InputName=quantize_h263_3dne +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) @@ -1129,14 +1207,14 @@ # End Source File # Begin Source File -SOURCE=..\..\src\quant\x86_asm\quantize_h263_mmx.asm +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_h263_mmx.asm -InputName=quantize_h263_mmx +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) @@ -1147,8 +1225,8 @@ # Begin Custom Build - Assembling $(InputPath) IntDir=.\Debug -InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm -InputName=quantize_h263_mmx +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) @@ -1430,6 +1508,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