Correct the source file lists for the VC6 projects against Makefile.am.

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

6 files changed, 708 insertions, 995 deletions

diff --git a/win32/vorbis_dynamic.dsp b/win32/vorbis_dynamic.dsp
index 35fda463..1d32c91f 100644
--- a/win32/vorbis_dynamic.dsp
+++ b/win32/vorbis_dynamic.dsp
@@ -98,10 +98,6 @@ 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
@@ -130,6 +126,10 @@ SOURCE=..\lib\info.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\lib\lookup.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\lib\lpc.c
 # End Source File
 # Begin Source File
@@ -191,7 +191,7 @@ SOURCE=..\lib\backends.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\lib\bitbuffer.h
+SOURCE=..\lib\bitrate.h
 # End Source File
 # Begin Source File
 
@@ -211,7 +211,7 @@ SOURCE=..\lib\envelope.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\lib\iir.h
+SOURCE=..\lib\highlevel.h
 # End Source File
 # Begin Source File
 
diff --git a/win32/vorbis_static.dsp b/win32/vorbis_static.dsp
index 837879ed..f31d1577 100644
--- a/win32/vorbis_static.dsp
+++ b/win32/vorbis_static.dsp
@@ -1,548 +1,252 @@
-# Microsoft Developer Studio Project File - Name="vorbis_static" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=vorbis_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 

-!MESSAGE NMAKE /f "vorbis_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 

-!MESSAGE NMAKE /f "vorbis_static.mak" CFG="vorbis_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "vorbis_static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "vorbis_static - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=xicl6.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "vorbis_static - 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_Static_Release"

-# PROP Intermediate_Dir "Vorbis_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "vorbis_static - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Vorbis_Static_Debug"

-# PROP Intermediate_Dir "Vorbis_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"Vorbis_Static_Debug\vorbis_static_d.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "vorbis_static - Win32 Release"

-# Name "vorbis_static - 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\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

-# 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=..\include\vorbis\backends.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\bitbuffer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\bitrate.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\bookinternal.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\codebook.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\codec.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\lpc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\lsp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\lsp12_0.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\lsp30_0.vqh

-# 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=..\include\vorbis\mode_A.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\mode_B.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\mode_C.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\mode_D.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\mode_E.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\modes.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=..\include\vorbis\book\res0_1024a_128_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_6.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_7.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_8.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_128_9.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_6.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_7.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_8.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_160_9.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_192_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_192_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_192_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_192_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_192_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_256_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_256_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_256_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_256_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_256_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_350_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_350_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_350_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_350_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_1024a_350_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_128_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_128_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_128_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_128_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_128_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_160_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_160_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_160_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_160_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_160_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_192_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_192_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_192_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_192_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_192_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_256_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_256_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_256_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_256_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_256_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_350_1.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_350_2.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_350_3.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_350_4.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\res0_128a_350_5.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_1024a_128.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_1024a_160.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_1024a_192.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_1024a_256.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_1024a_350.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_128a_128.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_128a_160.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_128a_192.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_128a_256.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\book\resaux0_128a_350.vqh

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\sharedbook.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

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="vorbis_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=vorbis_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 
+!MESSAGE NMAKE /f "vorbis_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 
+!MESSAGE NMAKE /f "vorbis_static.mak" CFG="vorbis_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbis_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "vorbis_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vorbis_static - 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_Static_Release"
+# PROP Intermediate_Dir "Vorbis_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "vorbis_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Vorbis_Static_Debug"
+# PROP Intermediate_Dir "Vorbis_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Vorbis_Static_Debug\vorbis_static_d.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbis_static - Win32 Release"
+# Name "vorbis_static - 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\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
+# 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\bitrate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\bitrate.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\highlevel.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
+# End Target
+# End Project
diff --git a/win32/vorbisenc_dynamic.dsp b/win32/vorbisenc_dynamic.dsp
index 1e44432e..3c91f2bd 100644
--- a/win32/vorbisenc_dynamic.dsp
+++ b/win32/vorbisenc_dynamic.dsp
@@ -1,134 +1,130 @@
-# Microsoft Developer Studio Project File - Name="vorbisenc_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=vorbisenc_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 "vorbisenc_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 "vorbisenc_dynamic.mak" CFG="vorbisenc_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "vorbisenc_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "vorbisenc_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)" == "vorbisenc_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 "VorbisEnc_Dynamic_Release"

-# PROP Intermediate_Dir "VorbisEnc_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 "VORBISENC_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 "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /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 vorbis.lib /nologo /dll /machine:I386 /out:"VorbisEnc_Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"

-

-!ELSEIF  "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "vorbisenc_dynamic___Win32_Debug"

-# PROP BASE Intermediate_Dir "vorbisenc_dynamic___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "VorbisEnc_Dynamic_Debug"

-# PROP Intermediate_Dir "VorbisEnc_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 "VORBISENC_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 "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /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 vorbis_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbisenc.def" /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"../../vorbis/win32/Vorbis_Dynamic_Debug"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "vorbisenc_dynamic - Win32 Release"

-# Name "vorbisenc_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\vorbisenc.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\src\shmmap.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\vorbis\vorbisenc.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=.\vorbisenc.def

-

-!IF  "$(CFG)" == "vorbisenc_dynamic - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="vorbisenc_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=vorbisenc_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 "vorbisenc_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 "vorbisenc_dynamic.mak" CFG="vorbisenc_dynamic - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbisenc_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vorbisenc_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)" == "vorbisenc_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 "VorbisEnc_Dynamic_Release"
+# PROP Intermediate_Dir "VorbisEnc_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 "VORBISENC_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 "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /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 vorbis.lib /nologo /dll /machine:I386 /out:"VorbisEnc_Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
+
+!ELSEIF  "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vorbisenc_dynamic___Win32_Debug"
+# PROP BASE Intermediate_Dir "vorbisenc_dynamic___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "VorbisEnc_Dynamic_Debug"
+# PROP Intermediate_Dir "VorbisEnc_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 "VORBISENC_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 "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /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 vorbis_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbisenc.def" /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"../../vorbis/win32/Vorbis_Dynamic_Debug"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbisenc_dynamic - Win32 Release"
+# Name "vorbisenc_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\vorbisenc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisenc.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=.\vorbisenc.def
+
+!IF  "$(CFG)" == "vorbisenc_dynamic - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win32/vorbisenc_static.dsp b/win32/vorbisenc_static.dsp
index 3c6c15a6..05a44919 100644
--- a/win32/vorbisenc_static.dsp
+++ b/win32/vorbisenc_static.dsp
@@ -1,96 +1,100 @@
-# Microsoft Developer Studio Project File - Name="vorbisenc_static" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=vorbisenc_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 

-!MESSAGE NMAKE /f "vorbisenc_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 

-!MESSAGE NMAKE /f "vorbisenc_static.mak" CFG="vorbisenc_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "vorbisenc_static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "vorbisenc_static - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=xicl6.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "vorbisenc_static - 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 "VorbisEnc_Static_Release"

-# PROP Intermediate_Dir "VorbisEnc_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "vorbisenc_static - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "VorbisEnc_Static_Debug"

-# PROP Intermediate_Dir "VorbisEnc_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"VorbisEnc_Static_Debug\vorbisenc_static_d.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "vorbisenc_static - Win32 Release"

-# Name "vorbisenc_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\lib\vorbisenc.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="vorbisenc_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=vorbisenc_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 
+!MESSAGE NMAKE /f "vorbisenc_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 
+!MESSAGE NMAKE /f "vorbisenc_static.mak" CFG="vorbisenc_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbisenc_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "vorbisenc_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vorbisenc_static - 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 "VorbisEnc_Static_Release"
+# PROP Intermediate_Dir "VorbisEnc_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "vorbisenc_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "VorbisEnc_Static_Debug"
+# PROP Intermediate_Dir "VorbisEnc_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"VorbisEnc_Static_Debug\vorbisenc_static_d.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbisenc_static - Win32 Release"
+# Name "vorbisenc_static - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\lib\vorbisenc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisenc.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win32/vorbisfile_dynamic.dsp b/win32/vorbisfile_dynamic.dsp
index 9735c453..550fe733 100644
--- a/win32/vorbisfile_dynamic.dsp
+++ b/win32/vorbisfile_dynamic.dsp
@@ -1,115 +1,119 @@
-# Microsoft Developer Studio Project File - Name="vorbisfile_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=vorbisfile_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 "vorbisfile_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 "vorbisfile_dynamic.mak" CFG="vorbisfile_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "vorbisfile_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "vorbisfile_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)" == "vorbisfile_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 "VorbisFile_Dynamic_Release"

-# PROP Intermediate_Dir "VorbisFile_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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /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 vorbis.lib /nologo /dll /machine:I386 /out:"VorbisFile_Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"

-

-!ELSEIF  "$(CFG)" == "vorbisfile_dynamic - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "vorbisfile_dynamic___Win32_Debug"

-# PROP BASE Intermediate_Dir "vorbisfile_dynamic___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "VorbisFile_Dynamic_Debug"

-# PROP Intermediate_Dir "VorbisFile_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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /YX /FD /GZ /c

-# 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 vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisFile_Dynamic_Debug/vorbisfile_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "vorbisfile_dynamic - Win32 Release"

-# Name "vorbisfile_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\vorbisfile.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# 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=.\vorbisfile.def

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="vorbisfile_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=vorbisfile_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 "vorbisfile_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 "vorbisfile_dynamic.mak" CFG="vorbisfile_dynamic - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbisfile_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "vorbisfile_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)" == "vorbisfile_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 "VorbisFile_Dynamic_Release"
+# PROP Intermediate_Dir "VorbisFile_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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /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 vorbis.lib /nologo /dll /machine:I386 /out:"VorbisFile_Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
+
+!ELSEIF  "$(CFG)" == "vorbisfile_dynamic - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vorbisfile_dynamic___Win32_Debug"
+# PROP BASE Intermediate_Dir "vorbisfile_dynamic___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "VorbisFile_Dynamic_Debug"
+# PROP Intermediate_Dir "VorbisFile_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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /YX /FD /GZ /c
+# 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 vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisFile_Dynamic_Debug/vorbisfile_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbisfile_dynamic - Win32 Release"
+# Name "vorbisfile_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\vorbisfile.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisfile.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=.\vorbisfile.def
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win32/vorbisfile_static.dsp b/win32/vorbisfile_static.dsp
index 10b41d57..7f62f950 100644
--- a/win32/vorbisfile_static.dsp
+++ b/win32/vorbisfile_static.dsp
@@ -1,96 +1,101 @@
-# Microsoft Developer Studio Project File - Name="vorbisfile_static" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=vorbisfile_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 

-!MESSAGE NMAKE /f "vorbisfile_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 

-!MESSAGE NMAKE /f "vorbisfile_static.mak" CFG="vorbisfile_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "vorbisfile_static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "vorbisfile_static - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=xicl6.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "vorbisfile_static - 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 "VorbisFile_Static_Release"

-# PROP Intermediate_Dir "VorbisFile_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "vorbisfile_static - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "VorbisFile_Static_Debug"

-# PROP Intermediate_Dir "VorbisFile_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"VorbisFile_Static_Debug\vorbisfile_static_d.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "vorbisfile_static - Win32 Release"

-# Name "vorbisfile_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\lib\vorbisfile.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="vorbisfile_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=vorbisfile_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 
+!MESSAGE NMAKE /f "vorbisfile_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 
+!MESSAGE NMAKE /f "vorbisfile_static.mak" CFG="vorbisfile_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vorbisfile_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "vorbisfile_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vorbisfile_static - 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 "VorbisFile_Static_Release"
+# PROP Intermediate_Dir "VorbisFile_Static_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 /MT /W2 /GX /Ox /Ot /Og /Oi /Ob2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "vorbisfile_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "VorbisFile_Static_Debug"
+# PROP Intermediate_Dir "VorbisFile_Static_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"VorbisFile_Static_Debug\vorbisfile_static_d.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vorbisfile_static - Win32 Release"
+# Name "vorbisfile_static - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\lib\vorbisfile.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+                                                                        
+        
+SOURCE=..\include\vorbis\vorbisfile.h
+# End Source File
+# End Group
+# End Target
+# End Project