Remove the apparently spuriously included vorbisenc.c from the vorbis.dll MSVC projec...

svn path=/trunk/vorbis/; revision=5495

diff --git a/win32/vorbis_dynamic.dsp b/win32/vorbis_dynamic.dsp
index 93357f6..35fda46 100644 (file)
--- a/win32/vorbis_dynamic.dsp
+++ b/win32/vorbis_dynamic.dsp
@@ -1,295 +1,291 @@
-# Microsoft Developer Studio Project File - Name="vorbis_dynamic" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=vorbis_dynamic - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "vorbis_dynamic.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "vorbis_dynamic.mak" CFG="vorbis_dynamic - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "vorbis_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "vorbis_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=xicl6.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Vorbis_Dynamic_Release"\r
-# PROP Intermediate_Dir "Vorbis_Dynamic_Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=xilink6.exe\r
-# 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\r
-# ADD 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 ogg.lib /nologo /dll /machine:I386 /out:"Vorbis_Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release"\r
-\r
-!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vorbis_dynamic___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "vorbis_dynamic___Win32_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Vorbis_Dynamic_Debug"\r
-# PROP Intermediate_Dir "Vorbis_Dynamic_Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=xilink6.exe\r
-# 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\r
-# ADD 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 ogg_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbis.def" /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"\r
-# SUBTRACT LINK32 /verbose /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "vorbis_dynamic - Win32 Release"\r
-# Name "vorbis_dynamic - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\analysis.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\barkmel.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\bitrate.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\block.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\codebook.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\envelope.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\floor0.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\floor1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\info.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lpc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lsp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\mapping0.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\mdct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\psy.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\registry.c\r
-\r
-!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"\r
-\r
-# ADD CPP /I "..\src"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\res0.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\sharedbook.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\smallft.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\synthesis.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\vorbisenc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\window.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\backends.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\bitbuffer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\codebook.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\include\vorbis\codec.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\codec_internal.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\envelope.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\iir.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lookup.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lookup_data.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lpc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\lsp.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\masking.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\mdct.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\misc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\os.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\psy.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\registry.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\scales.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\smallft.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\lib\window.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# Begin Group "Other Files"\r
-\r
-# PROP Default_Filter ".def"\r
-# Begin Source File\r
-\r
-SOURCE=.\vorbis.def\r
-\r
-!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
+# Microsoft Developer Studio Project File - Name="vorbis_dynamic" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=vorbis_dynamic - Win32 Debug
+!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 "vorbis_dynamic.mak".
+!MESSAGE 
+!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 "vorbis_dynamic.mak" CFG="vorbis_dynamic - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbis_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vorbis_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Vorbis_Dynamic_Release"
+# PROP Intermediate_Dir "Vorbis_Dynamic_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib /nologo /dll /machine:I386 /out:"Vorbis_Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release"
+
+!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vorbis_dynamic___Win32_Debug"
+# PROP BASE Intermediate_Dir "vorbis_dynamic___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Vorbis_Dynamic_Debug"
+# PROP Intermediate_Dir "Vorbis_Dynamic_Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbis.def" /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
+# SUBTRACT LINK32 /verbose /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbis_dynamic - Win32 Release"
+# Name "vorbis_dynamic - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\lib\analysis.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\barkmel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\bitrate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\block.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codebook.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\envelope.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\floor0.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\floor1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\info.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lpc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lsp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mapping0.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mdct.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\psy.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\registry.c
+
+!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"
+
+# ADD CPP /I "..\src"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\res0.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\sharedbook.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\smallft.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\synthesis.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\window.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\lib\backends.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\bitbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\vorbis\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codec_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\envelope.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\iir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lookup.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lookup_data.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lpc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\lsp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\masking.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mdct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\psy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\scales.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\smallft.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\window.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Group "Other Files"
+
+# PROP Default_Filter ".def"
+# Begin Source File
+
+SOURCE=.\vorbis.def
+
+!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project