--- trunk/xvidcore/build/win32/libxvidcore_static.dsp	2008/11/26 01:04:34	1795
+++ trunk/xvidcore/build/win32/libxvidcore_static.dsp	2008/11/26 02:12:41	1796
@@ -1,24 +1,24 @@
 # Microsoft Developer Studio Project File - Name="libxvidcore_static" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 CFG=libxvidcore_static - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+!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 
 !MESSAGE NMAKE /f "libxvidcore_static.mak".
 !MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
 !MESSAGE NMAKE /f "libxvidcore_static.mak" CFG="libxvidcore_static - Win32 Debug"
 !MESSAGE 
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
 !MESSAGE 
-!MESSAGE "libxvidcore_static - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libxvidcore_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "libxvidcore_static - Win32 Release" (basierend auf  "Win32 (x86) Static Library")
+!MESSAGE "libxvidcore_static - Win32 Debug" (basierend auf  "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -126,37 +126,6 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\bitstream\x86_asm\cbp_3dne.asm
-
-!IF  "$(CFG)" == "libxvidcore_static - 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_static - 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_static - Win32 Release"
@@ -167,7 +136,7 @@
 InputName=cbp_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -179,7 +148,7 @@
 InputName=cbp_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -198,7 +167,7 @@
 InputName=cbp_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -210,7 +179,7 @@
 InputName=cbp_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -273,7 +242,7 @@
 InputName=fdct_mmx_ffmpeg
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -285,7 +254,7 @@
 InputName=fdct_mmx_ffmpeg
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -304,7 +273,7 @@
 InputName=fdct_mmx_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -316,7 +285,7 @@
 InputName=fdct_mmx_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -335,7 +304,7 @@
 InputName=fdct_sse2_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -347,7 +316,7 @@
 InputName=fdct_sse2_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -366,7 +335,7 @@
 InputName=idct_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -378,7 +347,7 @@
 InputName=idct_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -397,7 +366,7 @@
 InputName=idct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -409,7 +378,7 @@
 InputName=idct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -428,7 +397,7 @@
 InputName=idct_sse2_dmitry
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -440,38 +409,7 @@
 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_static - 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_static - 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)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -521,26 +459,26 @@
 !IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+InputDir=\xvidcore\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 -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+InputDir=\xvidcore\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 -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -554,26 +492,26 @@
 !IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+InputDir=\xvidcore\src\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 -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+InputDir=\xvidcore\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 -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -587,26 +525,92 @@
 !IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+InputDir=\xvidcore\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 -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=..\..\src\image\x86_asm
+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)
+	nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image\x86_asm\deintl_sse.asm
+
+!IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvidcore\src\image\x86_asm
+IntDir=.\Release
+InputPath=..\..\src\image\x86_asm\deintl_sse.asm
+InputName=deintl_sse
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvidcore\src\image\x86_asm
+IntDir=.\Debug
+InputPath=..\..\src\image\x86_asm\deintl_sse.asm
+InputName=deintl_sse
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image\x86_asm\gmc_mmx.asm
+
+!IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvidcore\src\image\x86_asm
+IntDir=.\Release
+InputPath=..\..\src\image\x86_asm\gmc_mmx.asm
+InputName=gmc_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvidcore\src\image\x86_asm
+IntDir=.\Debug
+InputPath=..\..\src\image\x86_asm\gmc_mmx.asm
+InputName=gmc_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -625,7 +629,7 @@
 InputName=interpolate8x8_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -637,7 +641,7 @@
 InputName=interpolate8x8_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -656,7 +660,7 @@
 InputName=interpolate8x8_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -668,7 +672,7 @@
 InputName=interpolate8x8_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -687,7 +691,7 @@
 InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -699,7 +703,7 @@
 InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -718,7 +722,7 @@
 InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -730,7 +734,7 @@
 InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -749,7 +753,7 @@
 InputName=postprocessing_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -761,7 +765,7 @@
 InputName=postprocessing_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -780,7 +784,7 @@
 InputName=postprocessing_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -792,7 +796,7 @@
 InputName=postprocessing_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -811,7 +815,7 @@
 InputName=qpel_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -823,7 +827,7 @@
 InputName=qpel_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -842,7 +846,7 @@
 InputName=reduced_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -854,7 +858,7 @@
 InputName=reduced_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -942,7 +946,7 @@
 InputName=sad_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -954,7 +958,7 @@
 InputName=sad_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -973,7 +977,7 @@
 InputName=sad_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -985,7 +989,7 @@
 InputName=sad_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1004,7 +1008,7 @@
 InputName=sad_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1016,7 +1020,7 @@
 InputName=sad_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1035,7 +1039,7 @@
 InputName=sad_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1047,7 +1051,7 @@
 InputName=sad_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1066,7 +1070,7 @@
 InputName=sad_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1078,7 +1082,7 @@
 InputName=sad_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1185,7 +1189,7 @@
 InputName=quantize_h263_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1197,7 +1201,7 @@
 InputName=quantize_h263_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1216,7 +1220,7 @@
 InputName=quantize_h263_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1228,7 +1232,7 @@
 InputName=quantize_h263_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1247,7 +1251,7 @@
 InputName=quantize_mpeg_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1259,7 +1263,7 @@
 InputName=quantize_mpeg_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1278,7 +1282,7 @@
 InputName=quantize_mpeg_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1290,7 +1294,7 @@
 InputName=quantize_mpeg_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1341,7 +1345,7 @@
 InputName=cpuid
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1353,7 +1357,7 @@
 InputName=cpuid
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1372,7 +1376,7 @@
 InputName=interlacing_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1384,7 +1388,7 @@
 InputName=interlacing_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1403,7 +1407,7 @@
 InputName=mem_transfer_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1415,7 +1419,7 @@
 InputName=mem_transfer_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1434,7 +1438,7 @@
 InputName=mem_transfer_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1446,7 +1450,7 @@
 InputName=mem_transfer_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1534,6 +1538,41 @@
 
 # PROP Default_Filter ""
 # End Group
+# Begin Group "plugins_asm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\src\plugins\x86_asm\plugin_ssim-a.asm"
+
+!IF  "$(CFG)" == "libxvidcore_static - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\plugins\x86_asm\plugin_ssim-a.asm
+InputName=plugin_ssim-a
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore_static - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\plugins\x86_asm\plugin_ssim-a.asm
+InputName=plugin_ssim-a
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\src\plugins\plugin_2pass1.c
@@ -1558,6 +1597,10 @@
 
 SOURCE=..\..\src\plugins\plugin_single.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\plugins\plugin_ssim.c
+# End Source File
 # End Group
 # Begin Source File