--- trunk/vfw/vfw.dsp	2002/08/18 12:12:39	380
+++ trunk/vfw/vfw.dsp	2002/09/21 15:31:57	506
@@ -1,25 +1,24 @@
 # Microsoft Developer Studio Project File - Name="vfw" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
+# ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=vfw - 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 "vfw.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 "vfw.mak" CFG="vfw - Win32 Debug"
 !MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "vfw - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "vfw - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "vfw - Win32 Release _SMP" (basierend auf  "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vfw - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vfw - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -54,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.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 /dll /machine:I386
-# ADD LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\core.lib /nologo /dll /machine:I386 /out:"bin\xvid.dll"
+# ADD LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\libxvidcore.lib /nologo /dll /machine:I386 /out:"bin\xvid.dll"
 
 !ELSEIF  "$(CFG)" == "vfw - Win32 Debug"
 
@@ -70,7 +69,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 /I "..\xvidcore\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "BFRAMES" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\xvidcore\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /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"
@@ -80,43 +79,15 @@
 # ADD BSC32 /nologo
 LINK32=link.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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\core.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"bin\xvid.dll" /pdbtype:sept
+# ADD LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\libxvidcore.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"bin\xvid.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "vfw - Win32 Release _SMP"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vfw___Win32_Release__SMP"
-# PROP BASE Intermediate_Dir "vfw___Win32_Release__SMP"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_SMP"
-# PROP Intermediate_Dir "Release_SMP"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\xvidcore\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_SMP" /YX /FD /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
-LINK32=link.exe
-# ADD BASE LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\core.lib /nologo /dll /machine:I386 /out:"bin\xvid.dll"
-# ADD LINK32 user32.lib comdlg32.lib comctl32.lib advapi32.lib gdi32.lib shell32.lib winmm.lib ..\xvidcore\build\win32\bin\core.lib pthreadVC.lib /nologo /dll /machine:I386 /out:"bin\xvid.dll"
-
 !ENDIF 
 
 # Begin Target
 
 # Name "vfw - Win32 Release"
 # Name "vfw - Win32 Debug"
-# Name "vfw - Win32 Release _SMP"
 # Begin Group "doc"
 
 # PROP Default_Filter ""
@@ -195,7 +166,7 @@
 # End Group
 # Begin Source File
 
-SOURCE=..\xvidcore\build\win32\bin\core.lib
+SOURCE=..\xvidcore\build\win32\bin\libxvidcore.lib
 # End Source File
 # End Target
 # End Project