--- trunk/xvidcore/build/win32/core.dsp 2002/03/08 02:46:11 3 +++ trunk/xvidcore/build/win32/core.dsp 2002/07/07 09:45:40 262 @@ -41,7 +41,7 @@ # 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 /D "NDEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /Ob2 /D "NDEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0xc09 /d "NDEBUG" # ADD RSC /l 0xc09 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ # 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 /D "_DEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "ARCH_X86" /D "WIN32" /D "_MBCS" /D "_LIB" /D "BFRAMES" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0xc09 /d "_DEBUG" # ADD RSC /l 0xc09 /d "_DEBUG" BSC32=bscmake.exe @@ -89,6 +89,10 @@ # End Source File # Begin Source File +SOURCE=..\..\CodingStyle +# End Source File +# Begin Source File + SOURCE=..\..\gpl.txt # End Source File # Begin Source File @@ -133,6 +137,61 @@ !ENDIF # End Source File +# Begin Source File + +SOURCE=..\..\src\bitstream\x86_asm\cbp_sse2.asm + +!IF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\bitstream\x86_asm\cbp_sse2.asm +InputName=cbp_sse2 + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\bitstream\x86_asm\cbp_sse2.asm +InputName=cbp_sse2 + +"$(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 "bitstream_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\bitstream\bitstream.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\bitstream\cbp.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\bitstream\mbcoding.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\bitstream\vlc_codes.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\bitstream\zigzag.h +# End Source File # End Group # Begin Source File @@ -216,6 +275,18 @@ # End Source File # End Group +# Begin Group "dct_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\dct\fdct.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\dct\idct.h +# End Source File +# End Group # Begin Source File SOURCE=..\..\src\dct\fdct.c @@ -233,6 +304,37 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm + +!IF "$(CFG)" == "core - 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) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +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) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm !IF "$(CFG)" == "core - Win32 Release" @@ -264,6 +366,37 @@ # End Source File # Begin Source File +SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm + +!IF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +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) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +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) + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm !IF "$(CFG)" == "core - Win32 Release" @@ -449,12 +582,36 @@ # End Source File # End Group +# Begin Group "image_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\image\colorspace.h +# 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 +# End Group # Begin Source File SOURCE=..\..\src\image\colorspace.c # 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 @@ -499,6 +656,84 @@ !ENDIF # End Source File +# Begin Source File + +SOURCE=..\..\src\motion\x86_asm\sad_sse2.asm + +!IF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\motion\x86_asm\sad_sse2.asm +InputName=sad_sse2 + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\motion\x86_asm\sad_sse2.asm +InputName=sad_sse2 + +"$(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_xmm.asm + +!IF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\motion\x86_asm\sad_xmm.asm +InputName=sad_xmm + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Debug +InputPath=..\..\src\motion\x86_asm\sad_xmm.asm +InputName=sad_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 "motion_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\motion\motion.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\sad.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\motion\smp_motion_est.h +# End Source File # End Group # Begin Source File @@ -512,6 +747,10 @@ SOURCE=..\..\src\motion\sad.c # End Source File +# Begin Source File + +SOURCE=..\..\src\motion\smp_motion_est.c +# End Source File # End Group # Begin Group "prediction" @@ -520,6 +759,10 @@ SOURCE=..\..\src\prediction\mbprediction.c # End Source File +# Begin Source File + +SOURCE=..\..\src\prediction\mbprediction.h +# End Source File # End Group # Begin Group "quant" @@ -590,6 +833,26 @@ # 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\quant_h263.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\quant\quant_matrix.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\quant\quant_mpeg4.h +# End Source File +# End Group # Begin Source File SOURCE=..\..\src\quant\adapt_quant.c @@ -600,6 +863,10 @@ # End Source File # Begin Source File +SOURCE=..\..\src\quant\quant_matrix.c +# End Source File +# Begin Source File + SOURCE=..\..\src\quant\quant_mpeg4.c # End Source File # End Group @@ -672,6 +939,34 @@ # End Source File # End Group +# Begin Group "utils_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\utils\emms.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\utils\mbfunctions.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\utils\mem_align.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\utils\mem_transfer.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\utils\ratecontrol.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\utils\timer.h +# End Source File +# End Group # Begin Source File SOURCE=..\..\src\utils\emms.c @@ -697,6 +992,34 @@ SOURCE=..\..\src\utils\timer.c # End Source File # End Group +# Begin Group "xvidcore_h" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\decoder.h +# 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 + +SOURCE=..\..\src\global.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\portab.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\xvid.h +# End Source File +# End Group # Begin Source File SOURCE=..\..\src\decoder.c