--- trunk/xvidcore/build/win32/core.dsp 2002/05/09 00:15:51 168 +++ trunk/xvidcore/build/win32/core.dsp 2002/07/23 12:59:57 329 @@ -19,6 +19,7 @@ !MESSAGE !MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "core - Win32 Release _SMP" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -74,12 +75,36 @@ # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"bin\core.lib" +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "core___Win32_Release__SMP" +# PROP BASE Intermediate_Dir "core___Win32_Release__SMP" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release_SMP" +# PROP Intermediate_Dir "Release_SMP" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /Ob2 /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" /D "_SMP" /YX /FD /c +# 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 /out:"bin\core.lib" +# ADD LIB32 /nologo /out:"bin\core.lib" + !ENDIF # Begin Target # Name "core - Win32 Release" # Name "core - Win32 Debug" +# Name "core - Win32 Release _SMP" # Begin Group "docs" # PROP Default_Filter "" @@ -89,6 +114,10 @@ # End Source File # Begin Source File +SOURCE=..\..\CodingStyle +# End Source File +# Begin Source File + SOURCE=..\..\gpl.txt # End Source File # Begin Source File @@ -130,6 +159,61 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\bitstream\x86_asm\cbp_mmx.asm +InputName=cbp_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\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 + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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 @@ -205,6 +289,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm +InputName=fdct_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -236,6 +332,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\dct\x86_asm\idct_mmx.asm +InputName=idct_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -269,6 +377,49 @@ # 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 + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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" @@ -295,6 +446,61 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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) + +# End Custom Build + +!ENDIF + +# 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 + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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 @@ -326,6 +532,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm +InputName=rgb_to_yv12_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -357,6 +575,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm +InputName=yuv_to_yv12_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -388,6 +618,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm +InputName=yuyv_to_yv12_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -419,6 +661,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm +InputName=yv12_to_rgb24_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -450,6 +704,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm +InputName=yv12_to_rgb32_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -481,6 +747,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm +InputName=yv12_to_yuyv_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -494,6 +772,10 @@ # 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 @@ -507,6 +789,10 @@ # 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 @@ -522,6 +808,50 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\src\motion\x86_asm\sad_3dn.asm + +!IF "$(CFG)" == "core - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release +InputPath=..\..\src\motion\x86_asm\sad_3dn.asm +InputName=sad_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\motion\x86_asm\sad_3dn.asm +InputName=sad_3dn + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\motion\x86_asm\sad_3dn.asm +InputName=sad_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\motion\x86_asm\sad_mmx.asm !IF "$(CFG)" == "core - Win32 Release" @@ -548,6 +878,104 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\motion\x86_asm\sad_mmx.asm +InputName=sad_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\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 + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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 + +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +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 @@ -563,6 +991,10 @@ 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 @@ -576,6 +1008,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" @@ -623,6 +1059,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm +InputName=quantize4_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -654,6 +1102,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm +InputName=quantize_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -729,6 +1189,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\utils\x86_asm\cpuid.asm +InputName=cpuid + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File @@ -760,6 +1232,18 @@ # End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 Release _SMP" + +# Begin Custom Build - Assembling $(InputPath) +IntDir=.\Release_SMP +InputPath=..\..\src\utils\x86_asm\mem_transfer_mmx.asm +InputName=mem_transfer_mmx + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath) + +# End Custom Build + !ENDIF # End Source File