--- trunk/xvidcore/build/win32/core.dsp	2002/03/11 01:16:26	22
+++ branches/dev-api-3/xvidcore/build/win32/core.dsp	2002/11/08 22:43:51	637
@@ -1,31 +1,32 @@
 # Microsoft Developer Studio Project File - Name="core" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
+# ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 CFG=core - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!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 "core.mak".
 !MESSAGE 
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!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 "core.mak" CFG="core - Win32 Debug"
 !MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "core - Win32 Release" (basierend auf  "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug" (basierend auf  "Win32 (x86) Static Library")
+!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
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "core - Win32 Release"
@@ -41,13 +42,13 @@
 # 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" /D "BFRAMES" /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=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"bin\core.lib"
 
@@ -64,22 +65,46 @@
 # 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
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # 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,10 +159,89 @@
 
 # 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
 # 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
 
 SOURCE=..\..\src\bitstream\bitstream.c
@@ -181,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
@@ -212,10 +332,34 @@
 
 # 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
 # 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,29 +377,48 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.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)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_mmx
+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)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_mmx
+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)" == "core - Win32 Release _SMP"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
+IntDir=.\Release_SMP
+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)
 
 # End Custom Build
 
@@ -264,29 +427,44 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
-InputName=rgb_to_yv12_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)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
-InputName=rgb_to_yv12_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)" == "core - Win32 Release _SMP"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
+IntDir=.\Release_SMP
+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)
 
 # End Custom Build
 
@@ -295,29 +473,44 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
+InputName=colorspace_yuyv_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)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
+InputName=colorspace_yuyv_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)" == "core - Win32 Release _SMP"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
+IntDir=.\Release_SMP
+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
 
@@ -326,14 +519,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
+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\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
+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)
@@ -344,8 +537,20 @@
 
 # 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_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)
@@ -357,14 +562,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
 
 !IF  "$(CFG)" == "core - 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\interpolate8x8_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -375,8 +580,20 @@
 
 # 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\interpolate8x8_mmx.asm
+InputName=interpolate8x8_mmx
+
+"$(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_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -388,14 +605,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
+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\yv12_to_rgb32_mmx.asm
-InputName=yv12_to_rgb32_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)
@@ -406,47 +623,48 @@
 
 # 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\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\yv12_to_yuyv_mmx.asm
-
-!IF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
 
 # Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
-InputName=yv12_to_yuyv_mmx
+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
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ENDIF 
 
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
-InputName=yv12_to_yuyv_mmx
+# End Source File
+# End Group
+# Begin Group "image_h"
 
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+# PROP Default_Filter ""
+# Begin Source File
 
-# End Custom Build
+SOURCE=..\..\src\image\colorspace.h
+# End Source File
+# Begin Source File
 
-!ENDIF 
+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
@@ -455,6 +673,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
@@ -470,6 +692,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"
@@ -496,10 +762,128 @@
 
 # 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
 # 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\motion_est.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
 
 SOURCE=..\..\src\motion\motion_comp.c
@@ -512,6 +896,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 +908,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"
 
@@ -545,7 +937,7 @@
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# Begin Custom Build
+# Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
 InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm
 InputName=quantize4_mmx
@@ -555,6 +947,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
@@ -576,7 +980,7 @@
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# Begin Custom Build
+# Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
 InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm
 InputName=quantize_mmx
@@ -586,10 +990,42 @@
 
 # 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
 # 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
@@ -641,6 +1077,61 @@
 
 # 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
+# Begin Source File
+
+SOURCE=..\..\src\utils\x86_asm\interlacing_mmx.asm
+
+!IF  "$(CFG)" == "core - 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)" == "core - 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
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release_SMP
+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
@@ -672,10 +1163,50 @@
 
 # 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
 # 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
@@ -701,6 +1232,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