60 files changed, 9 insertions, 4888 deletions

diff --git a/FLAC.dsw b/FLAC.dsw
deleted file mode 100644
index c2e338ad..00000000
--- a/FLAC.dsw
+++ /dev/null
@@ -1,683 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "all"=.\all.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name all_dynamic

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name all_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "all_dynamic"=.\all_dynamic.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name examples

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name iffscan

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name metaflac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name in_flac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac_mac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac_ren

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flacdiff

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flactimer

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_analysis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_synthesis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name getopt_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_dynamic

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_dynamic

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libs_common_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name plugin_common_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name utf8_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_cuesheet

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_picture

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libFLAC

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libFLAC++

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_seeking

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_streams

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "all_static"=.\all_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name examples

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name iffscan

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name metaflac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name in_flac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac_mac

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flac_ren

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flacdiff

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flactimer

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_analysis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_synthesis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name getopt_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libs_common_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name plugin_common_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name utf8_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_cuesheet

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_picture

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libFLAC

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libFLAC++

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_seeking

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_streams

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "examples"=.\examples\examples.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name example_c_decode_file

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name example_c_encode_file

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name example_cpp_decode_file

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name example_cpp_encode_file

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "example_c_decode_file"=.\examples\c\decode\file\example_c_decode_file.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "example_c_encode_file"=.\examples\c\encode\file\example_c_encode_file.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "example_cpp_decode_file"=.\examples\cpp\decode\file\example_cpp_decode_file.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "example_cpp_encode_file"=.\examples\cpp\encode\file\example_cpp_encode_file.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "flac"=.\src\flac\flac.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_analysis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_synthesis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name getopt_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name utf8_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "iffscan"=.\src\flac\iffscan.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "flac_mac"=.\src\monkeys_audio_utilities\flac_mac\flac_mac.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "flac_ren"=.\src\monkeys_audio_utilities\flac_ren\flac_ren.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "replaygain_analysis_static"=.\src\share\replaygain_analysis\replaygain_analysis_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "replaygain_synthesis_static"=.\src\share\replaygain_synthesis\replaygain_synthesis_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "getopt_static"=.\src\share\getopt\getopt_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "grabbag_static"=.\src\share\grabbag\grabbag_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name replaygain_analysis_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "in_flac"=.\src\plugin_winamp2\in_flac.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name plugin_common_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libFLAC_dynamic"=.\src\libFLAC\libFLAC_dynamic.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libFLAC_static"=.\src\libFLAC\libFLAC_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libFLAC++_dynamic"=".\src\libFLAC++\libFLAC++_dynamic.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_dynamic

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "libFLAC++_static"=".\src\libFLAC++\libFLAC++_static.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "metaflac"=.\src\metaflac\metaflac.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name replaygain_analysis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name getopt_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name utf8_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "plugin_common_static"=.\src\plugin_common\plugin_common_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name replaygain_synthesis_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_cuesheet"=.\src\test_grabbag\cuesheet\test_cuesheet.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_picture"=.\src\test_grabbag\picture\test_picture.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name grabbag_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_libs_common"=.\src\test_libs_common\test_libs_common_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_libFLAC"=.\src\test_libFLAC\test_libFLAC.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libs_common_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_libFLAC++"=".\src\test_libFLAC++\test_libFLAC++.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name test_libs_common_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "test_seeking"=.\src\test_seeking\test_seeking.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "test_streams"=.\src\test_streams\test_streams.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "utf8_static"=.\src\share\utf8\utf8_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "flacdiff"=".\src\utils\flacdiff\flacdiff.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libFLAC++_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "flactimer"=".\src\utils\flactimer\flactimer.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/Makefile.am b/Makefile.am
index 9b7bd046..29f81a4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,12 +37,8 @@ EXTRA_DIST = \
 	COPYING.GPL \
 	COPYING.LGPL \
 	COPYING.Xiph \
-	FLAC.dsw \
 	FLAC.sln \
 	Makefile.lite \
-	all.dsp \
-	all_dynamic.dsp \
-	all_static.dsp \
 	autogen.sh \
 	config.rpath \
 	depcomp \
diff --git a/all.dsp b/all.dsp
deleted file mode 100644
index abe78722..00000000
--- a/all.dsp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Generic Project" 0x010a

-

-CFG=all - 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 "all.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 "all.mak" CFG="all - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "all - Win32 Release" (based on "Win32 (x86) Generic Project")

-!MESSAGE "all - Win32 Debug" (based on "Win32 (x86) Generic Project")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "all"

-# PROP Scc_LocalPath "."

-MTL=midl.exe

-

-!IF  "$(CFG)" == "all - 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 "objs\release"

-# PROP Intermediate_Dir "objs\release"

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "all - 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 "objs\debug"

-# PROP Intermediate_Dir "objs\debug"

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "all - Win32 Release"

-# Name "all - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Target

-# End Project

diff --git a/all_dynamic.dsp b/all_dynamic.dsp
deleted file mode 100644
index 719dc274..00000000
--- a/all_dynamic.dsp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all_dynamic" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Generic Project" 0x010a

-

-CFG=all_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 "all_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 "all_dynamic.mak" CFG="all_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "all_dynamic - Win32 Release" (based on "Win32 (x86) Generic Project")

-!MESSAGE "all_dynamic - Win32 Debug" (based on "Win32 (x86) Generic Project")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "all"

-# PROP Scc_LocalPath "."

-MTL=midl.exe

-

-!IF  "$(CFG)" == "all_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 "objs\release"

-# PROP Intermediate_Dir "objs\release"

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "all_dynamic - 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 "objs\debug"

-# PROP Intermediate_Dir "objs\debug"

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "all_dynamic - Win32 Release"

-# Name "all_dynamic - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Target

-# End Project

diff --git a/all_static.dsp b/all_static.dsp
deleted file mode 100644
index af982271..00000000
--- a/all_static.dsp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Microsoft Developer Studio Project File - Name="all_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Generic Project" 0x010a

-

-CFG=all_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 "all_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 "all_static.mak" CFG="all_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "all_static - Win32 Release" (based on "Win32 (x86) Generic Project")

-!MESSAGE "all_static - Win32 Debug" (based on "Win32 (x86) Generic Project")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "all"

-# PROP Scc_LocalPath "."

-MTL=midl.exe

-

-!IF  "$(CFG)" == "all_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 "objs\release"

-# PROP Intermediate_Dir "objs\release"

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "all_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 "objs\debug"

-# PROP Intermediate_Dir "objs\debug"

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "all_static - Win32 Release"

-# Name "all_static - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Target

-# End Project

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 66cdf8b1..d57d8837 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,6 +22,5 @@ endif
 SUBDIRS = c $(CPPLIBS_DIRS)
 
 EXTRA_DIST = \
-	examples.dsp \
 	Makefile.lite \
 	README
diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am
index df020e8e..7926e481 100644
--- a/examples/c/decode/file/Makefile.am
+++ b/examples/c/decode/file/Makefile.am
@@ -17,8 +17,8 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_c_decode_file.dsp \
 	example_c_decode_file.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = example_c_decode_file
 example_c_decode_file_LDADD = \
diff --git a/examples/c/decode/file/example_c_decode_file.dsp b/examples/c/decode/file/example_c_decode_file.dsp
deleted file mode 100644
index 3b4684cf..00000000
--- a/examples/c/decode/file/example_c_decode_file.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="example_c_decode_file" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=example_c_decode_file - 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 "example_c_decode_file.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 "example_c_decode_file.mak" CFG="example_c_decode_file - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "example_c_decode_file - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "example_c_decode_file - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "example_c_decode_file - 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 "..\..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\..\objs\release\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "example_c_decode_file - 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 "..\..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\..\objs\debug\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "example_c_decode_file - Win32 Release"

-# Name "example_c_decode_file - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am
index 5551f133..82235632 100644
--- a/examples/c/encode/file/Makefile.am
+++ b/examples/c/encode/file/Makefile.am
@@ -17,8 +17,8 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_c_encode_file.dsp \
 	example_c_encode_file.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = example_c_encode_file
 example_c_encode_file_LDADD = \
diff --git a/examples/c/encode/file/example_c_encode_file.dsp b/examples/c/encode/file/example_c_encode_file.dsp
deleted file mode 100644
index 98cd1082..00000000
--- a/examples/c/encode/file/example_c_encode_file.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="example_c_encode_file" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=example_c_encode_file - 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 "example_c_encode_file.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 "example_c_encode_file.mak" CFG="example_c_encode_file - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "example_c_encode_file - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "example_c_encode_file - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "example_c_encode_file - 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 "..\..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\..\objs\release\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "example_c_encode_file - 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 "..\..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\..\objs\debug\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "example_c_encode_file - Win32 Release"

-# Name "example_c_encode_file - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am
index 85674777..374541c8 100644
--- a/examples/cpp/decode/file/Makefile.am
+++ b/examples/cpp/decode/file/Makefile.am
@@ -17,8 +17,8 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_cpp_decode_file.dsp \
 	example_cpp_decode_file.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = example_cpp_decode_file
 example_cpp_decode_file_LDADD = \
diff --git a/examples/cpp/decode/file/example_cpp_decode_file.dsp b/examples/cpp/decode/file/example_cpp_decode_file.dsp
deleted file mode 100644
index ea1679e0..00000000
--- a/examples/cpp/decode/file/example_cpp_decode_file.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="example_cpp_decode_file" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=example_cpp_decode_file - 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 "example_cpp_decode_file.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 "example_cpp_decode_file.mak" CFG="example_cpp_decode_file - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "example_cpp_decode_file - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "example_cpp_decode_file - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "example_cpp_decode_file - 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 "..\..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\..\objs\release\lib\libFLAC++_static.lib ..\..\..\..\objs\release\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "example_cpp_decode_file - 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 "..\..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\..\objs\debug\lib\libFLAC++_static.lib ..\..\..\..\objs\debug\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "example_cpp_decode_file - Win32 Release"

-# Name "example_cpp_decode_file - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am
index 22963d33..3757475e 100644
--- a/examples/cpp/encode/file/Makefile.am
+++ b/examples/cpp/encode/file/Makefile.am
@@ -17,8 +17,8 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_cpp_encode_file.dsp \
 	example_cpp_encode_file.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = example_cpp_encode_file
 example_cpp_encode_file_LDADD = \
diff --git a/examples/cpp/encode/file/example_cpp_encode_file.dsp b/examples/cpp/encode/file/example_cpp_encode_file.dsp
deleted file mode 100644
index 6922347c..00000000
--- a/examples/cpp/encode/file/example_cpp_encode_file.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="example_cpp_encode_file" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=example_cpp_encode_file - 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 "example_cpp_encode_file.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 "example_cpp_encode_file.mak" CFG="example_cpp_encode_file - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "example_cpp_encode_file - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "example_cpp_encode_file - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "example_cpp_encode_file - 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 "..\..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\..\objs\release\lib\libFLAC++_static.lib ..\..\..\..\objs\release\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "example_cpp_encode_file - 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 "..\..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\..\objs\debug\lib\libFLAC++_static.lib ..\..\..\..\objs\debug\lib\libFLAC_static.lib ..\..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "example_cpp_encode_file - Win32 Release"

-# Name "example_cpp_encode_file - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/examples/examples.dsp b/examples/examples.dsp
deleted file mode 100644
index f17378c5..00000000
--- a/examples/examples.dsp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Microsoft Developer Studio Project File - Name="examples" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Generic Project" 0x010a

-

-CFG=examples - 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 "examples.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 "examples.mak" CFG="examples - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "examples - Win32 Release" (based on "Win32 (x86) Generic Project")

-!MESSAGE "examples - Win32 Debug" (based on "Win32 (x86) Generic Project")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "all"

-# PROP Scc_LocalPath "."

-MTL=midl.exe

-

-!IF  "$(CFG)" == "examples - 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 "..\objs\release"

-# PROP Intermediate_Dir "..\objs\release"

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "examples - 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 "..\objs\debug"

-# PROP Intermediate_Dir "..\objs\debug"

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "examples - Win32 Release"

-# Name "examples - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Target

-# End Project

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index abc10f52..44ac91e8 100644
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -22,10 +22,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.lite.iffscan \
-	flac.dsp \
 	flac.vcproj \
 	iffscan.c \
-	iffscan.dsp \
 	iffscan.vcproj
 
 flac_SOURCES = \
diff --git a/src/flac/flac.dsp b/src/flac/flac.dsp
deleted file mode 100644
index 607eac76..00000000
--- a/src/flac/flac.dsp
+++ /dev/null
@@ -1,156 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flac" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=flac - 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 "flac.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 "flac.mak" CFG="flac - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "flac - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "flac - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "flac - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\grabbag_static.lib ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\objs\release\lib\replaygain_synthesis_static.lib ..\..\objs\release\lib\getopt_static.lib ..\..\objs\release\lib\utf8_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "flac - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\grabbag_static.lib ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\objs\debug\lib\replaygain_synthesis_static.lib ..\..\objs\debug\lib\getopt_static.lib ..\..\objs\debug\lib\utf8_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "flac - Win32 Release"

-# Name "flac - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\analyze.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\foreign_metadata.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\local_string_utils.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utils.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\vorbiscomment.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\analyze.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\foreign_metadata.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\local_string_utils.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utils.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\vorbiscomment.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/flac/iffscan.dsp b/src/flac/iffscan.dsp
deleted file mode 100644
index 9b63fee5..00000000
--- a/src/flac/iffscan.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="iffscan" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=iffscan - 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 "iffscan.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 "iffscan.mak" CFG="iffscan - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "iffscan - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "iffscan - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "iffscan - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "iffscan - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "iffscan - Win32 Release"

-# Name "iffscan - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\iffscan.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\foreign_metadata.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\foreign_metadata.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 68a56285..6bd16573 100644
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -39,9 +39,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
 	flac++.pc.in \
-	libFLAC++_dynamic.dsp \
 	libFLAC++_dynamic.vcproj \
-	libFLAC++_static.dsp \
 	libFLAC++_static.vcproj \
 	libFLAC++.m4
 
diff --git a/src/libFLAC++/libFLAC++_dynamic.dsp b/src/libFLAC++/libFLAC++_dynamic.dsp
deleted file mode 100644
index 371062f2..00000000
--- a/src/libFLAC++/libFLAC++_dynamic.dsp
+++ /dev/null
@@ -1,139 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libFLAC++_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=libFLAC++_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 "libFLAC++_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 "libFLAC++_dynamic.mak" CFG="libFLAC++_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libFLAC++_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libFLAC++_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "libFLAC++"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libFLAC++_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_dynamic"

-# 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 /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLACPP_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /subsystem:windows /dll /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\objs\release\bin/libFLAC++.dll"

-

-!ELSEIF  "$(CFG)" == "libFLAC++_dynamic - 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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_dynamic"

-# 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 /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLACPP_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\objs\debug\bin/libFLAC++.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libFLAC++_dynamic - Win32 Release"

-# Name "libFLAC++_dynamic - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\metadata.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_decoder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder.cpp

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\all.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\decoder.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\encoder.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\export.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\metadata.h"

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/libFLAC++/libFLAC++_static.dsp b/src/libFLAC++/libFLAC++_static.dsp
deleted file mode 100644
index f222bb0e..00000000
--- a/src/libFLAC++/libFLAC++_static.dsp
+++ /dev/null
@@ -1,132 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libFLAC++_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=libFLAC++_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 "libFLAC++_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 "libFLAC++_static.mak" CFG="libFLAC++_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libFLAC++_static - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "libFLAC++_static - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "libFLAC++"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libFLAC++_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /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)" == "libFLAC++_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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /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

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libFLAC++_static - Win32 Release"

-# Name "libFLAC++_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\metadata.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_decoder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder.cpp

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\all.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\decoder.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\encoder.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\export.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\..\include\FLAC++\metadata.h"

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index aa881001..7928abfd 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -95,9 +95,7 @@ pkgconfig_DATA = flac.pc
 EXTRA_DIST = \
 	Makefile.lite \
 	flac.pc.in \
-	libFLAC_dynamic.dsp \
 	libFLAC_dynamic.vcproj \
-	libFLAC_static.dsp \
 	libFLAC_static.vcproj \
 	libFLAC.m4
 
diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp
deleted file mode 100644
index 15a3dc20..00000000
--- a/src/libFLAC/libFLAC_dynamic.dsp
+++ /dev/null
@@ -1,464 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libFLAC_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=libFLAC_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 "libFLAC_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 "libFLAC_dynamic.mak" CFG="libFLAC_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "libFLAC_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "libFLAC"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libFLAC_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_dynamic"

-# 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 /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.3.0pre2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D FLaC__INLINE=_inline /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /subsystem:windows /dll /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\objs\release\bin/libFLAC.dll"

-

-!ELSEIF  "$(CFG)" == "libFLAC_dynamic - 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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_dynamic"

-# 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 /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.3.0pre2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\objs\debug\bin/libFLAC.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libFLAC_dynamic - Win32 Release"

-# Name "libFLAC_dynamic - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Group "Assembly Files (ia32)"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\ia32\bitreader_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/bitreader_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\bitreader_asm.nasm

-

-"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/bitreader_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\bitreader_asm.nasm

-

-"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\cpu_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/cpu_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\cpu_asm.nasm

-

-"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/cpu_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\cpu_asm.nasm

-

-"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\fixed_asm.nasm

-

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

-

-USERDEP__FIXED="ia32/fixed_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\fixed_asm.nasm

-

-"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__FIXED="ia32/fixed_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\fixed_asm.nasm

-

-"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\lpc_asm.nasm

-

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

-

-USERDEP__LPC_A="ia32/lpc_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\lpc_asm.nasm

-

-"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__LPC_A="ia32/lpc_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\lpc_asm.nasm

-

-"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\stream_encoder_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\stream_encoder_asm.nasm

-

-"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\stream_encoder_asm.nasm

-

-"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\nasm.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\bitmath.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bitreader.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bitwriter.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\cpu.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\crc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\fixed.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\float.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\format.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\lpc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\md5.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\memory.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_iterators.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_object.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_decoder_aspect.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_encoder_aspect.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_helper.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_mapping.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_decoder.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder_framing.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\window.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\private\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitmath.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitreader.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitwriter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\cpu.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\crc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\fixed.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\float.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\format.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\lpc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\md5.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\memory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\metadata.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_decoder_aspect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_encoder_aspect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_helper.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_mapping.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\stream_encoder_framing.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\window.h

-# End Source File

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\protected\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\protected\stream_decoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\protected\stream_encoder.h

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\export.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\format.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\metadata.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\ordinals.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\stream_decoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\stream_encoder.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/libFLAC/libFLAC_static.dsp b/src/libFLAC/libFLAC_static.dsp
deleted file mode 100644
index 243b8ec1..00000000
--- a/src/libFLAC/libFLAC_static.dsp
+++ /dev/null
@@ -1,457 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libFLAC_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=libFLAC_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 "libFLAC_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 "libFLAC_static.mak" CFG="libFLAC_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "libFLAC"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libFLAC_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.3.0pre2\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D FLaC__INLINE=_inline /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "libFLAC_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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.3.0pre2\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libFLAC_static - Win32 Release"

-# Name "libFLAC_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Group "Assembly Files (ia32)"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\ia32\bitreader_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/bitreader_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\bitreader_asm.nasm

-

-"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/bitreader_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\bitreader_asm.nasm

-

-"ia32/bitreader_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/bitreader_asm.nasm -o ia32/bitreader_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\cpu_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/cpu_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\cpu_asm.nasm

-

-"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/cpu_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\cpu_asm.nasm

-

-"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\fixed_asm.nasm

-

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

-

-USERDEP__FIXED="ia32/fixed_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\fixed_asm.nasm

-

-"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__FIXED="ia32/fixed_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\fixed_asm.nasm

-

-"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\lpc_asm.nasm

-

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

-

-USERDEP__LPC_A="ia32/lpc_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\lpc_asm.nasm

-

-"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__LPC_A="ia32/lpc_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\lpc_asm.nasm

-

-"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\stream_encoder_asm.nasm

-

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

-

-USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\stream_encoder_asm.nasm

-

-"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj

-

-# End Custom Build

-

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

-

-USERDEP__CPU_A="ia32/stream_encoder_asm.nasm"	

-# Begin Custom Build

-InputPath=.\ia32\stream_encoder_asm.nasm

-

-"ia32/stream_encoder_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	nasmw.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/stream_encoder_asm.nasm -o ia32/stream_encoder_asm.obj

-

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ia32\nasm.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\bitmath.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bitreader.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bitwriter.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\cpu.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\crc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\fixed.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\float.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\format.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\lpc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\md5.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\memory.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_iterators.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_object.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_decoder_aspect.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_encoder_aspect.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_helper.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\ogg_mapping.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_decoder.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\stream_encoder_framing.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\window.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\private\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitmath.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitreader.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\bitwriter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\cpu.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\crc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\fixed.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\float.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\format.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\lpc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\md5.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\memory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\metadata.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_decoder_aspect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_encoder_aspect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_helper.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\ogg_mapping.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\stream_encoder_framing.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\private\window.h

-# End Source File

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\protected\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\protected\stream_decoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\protected\stream_encoder.h

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\assert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\export.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\format.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\metadata.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\ordinals.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\stream_decoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\FLAC\stream_encoder.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 11b63102..b96bafa2 100644
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -21,7 +21,6 @@ AM_CFLAGS = @OGG_CFLAGS@
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
-	metaflac.dsp \
 	metaflac.vcproj
 
 metaflac_SOURCES = \
diff --git a/src/metaflac/metaflac.dsp b/src/metaflac/metaflac.dsp
deleted file mode 100644
index 74f64525..00000000
--- a/src/metaflac/metaflac.dsp
+++ /dev/null
@@ -1,152 +0,0 @@
-# Microsoft Developer Studio Project File - Name="metaflac" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=metaflac - 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 "metaflac.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 "metaflac.mak" CFG="metaflac - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "metaflac - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "metaflac - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "metaflac - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\grabbag_static.lib ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\objs\release\lib\getopt_static.lib ..\..\objs\release\lib\utf8_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "metaflac - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\grabbag_static.lib ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\objs\debug\lib\getopt_static.lib ..\..\objs\debug\lib\utf8_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "metaflac - Win32 Release"

-# Name "metaflac - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations_shorthand_cuesheet.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations_shorthand_picture.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations_shorthand_seektable.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations_shorthand_streaminfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\operations_shorthand_vorbiscomment.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\options.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\usage.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utils.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\operations.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\options.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\usage.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\utils.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/monkeys_audio_utilities/flac_mac/Makefile.am b/src/monkeys_audio_utilities/flac_mac/Makefile.am
index 2cca363f..3a3526b4 100644
--- a/src/monkeys_audio_utilities/flac_mac/Makefile.am
+++ b/src/monkeys_audio_utilities/flac_mac/Makefile.am
@@ -16,6 +16,5 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	flac_mac.dsp \
 	flac_mac.vcproj \
 	main.c
diff --git a/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp b/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp
deleted file mode 100644
index 772b0367..00000000
--- a/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flac_mac" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=flac_mac - 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 "flac_mac.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 "flac_mac.mak" CFG="flac_mac - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "flac_mac - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "flac_mac - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "flac_mac - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "flac_mac - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "flac_mac - Win32 Release"

-# Name "flac_mac - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/src/monkeys_audio_utilities/flac_ren/Makefile.am b/src/monkeys_audio_utilities/flac_ren/Makefile.am
index 73b2bc56..998ce8e5 100644
--- a/src/monkeys_audio_utilities/flac_ren/Makefile.am
+++ b/src/monkeys_audio_utilities/flac_ren/Makefile.am
@@ -16,6 +16,5 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	flac_ren.dsp \
 	flac_ren.vcproj \
 	main.c
diff --git a/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp b/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp
deleted file mode 100644
index 4d1caaa8..00000000
--- a/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flac_ren" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=flac_ren - 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 "flac_ren.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 "flac_ren.mak" CFG="flac_ren - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "flac_ren - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "flac_ren - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "flac_ren - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "flac_ren - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "flac_ren - Win32 Release"

-# Name "flac_ren - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am
index 270416a0..7fee4fa0 100644
--- a/src/plugin_common/Makefile.am
+++ b/src/plugin_common/Makefile.am
@@ -36,7 +36,6 @@ libplugin_common_la_SOURCES = \
 EXTRA_DIST = \
 	Makefile.lite \
 	README \
-	plugin_common_static.dsp \
 	plugin_common_static.vcproj
 
 debug:
diff --git a/src/plugin_common/plugin_common_static.dsp b/src/plugin_common/plugin_common_static.dsp
deleted file mode 100644
index 40ad6ba9..00000000
--- a/src/plugin_common/plugin_common_static.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="plugin_common_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=plugin_common_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 "plugin_common_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 "plugin_common_static.mak" CFG="plugin_common_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "plugin_common"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "plugin_common_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D FLaC__INLINE=_inline /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "plugin_common_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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "plugin_common_static - Win32 Release"

-# Name "plugin_common_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\charset.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\dither.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\replaygain.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tags.c

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\all.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\charset.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\dither.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\replaygain.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tags.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/share/getopt/Makefile.am b/src/share/getopt/Makefile.am
index f9a6fa3c..c4021afe 100644
--- a/src/share/getopt/Makefile.am
+++ b/src/share/getopt/Makefile.am
@@ -8,7 +8,6 @@ libgetopt_a_SOURCES = getopt.c getopt1.c
 
 EXTRA_DIST = \
 	Makefile.lite \
-	getopt_static.dsp \
 	getopt_static.vcproj
 
 debug:
diff --git a/src/share/getopt/getopt_static.dsp b/src/share/getopt/getopt_static.dsp
deleted file mode 100644
index ffb5ed9d..00000000
--- a/src/share/getopt/getopt_static.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="getopt_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=getopt_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 "getopt_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 "getopt_static.mak" CFG="getopt_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "getopt"

-# PROP Scc_LocalPath "..\..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "getopt_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 "..\..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I "..\..\..\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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "getopt_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 "..\..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "getopt_static - Win32 Release"

-# Name "getopt_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\getopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\getopt1.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\getopt.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/share/grabbag/Makefile.am b/src/share/grabbag/Makefile.am
index ada5cc8c..a7f2ee71 100644
--- a/src/share/grabbag/Makefile.am
+++ b/src/share/grabbag/Makefile.am
@@ -14,7 +14,6 @@ libgrabbag_la_SOURCES = \
 
 EXTRA_DIST = \
 	Makefile.lite \
-	grabbag_static.dsp \
 	grabbag_static.vcproj
 
 debug:
diff --git a/src/share/grabbag/grabbag_static.dsp b/src/share/grabbag/grabbag_static.dsp
deleted file mode 100644
index a30d46f6..00000000
--- a/src/share/grabbag/grabbag_static.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="grabbag_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=grabbag_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 "grabbag_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 "grabbag_static.mak" CFG="grabbag_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "grabbag"

-# PROP Scc_LocalPath "..\..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "grabbag_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 "..\..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\..\include" /D "FLAC__NO_DLL" /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "grabbag_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 "..\..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "grabbag_static - Win32 Release"

-# Name "grabbag_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\cuesheet.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\picture.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\replaygain.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\seektable.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag\cuesheet.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag\file.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag\picture.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag\replaygain.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag\seektable.h

-# End Source File

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\grabbag.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/share/replaygain_analysis/Makefile.am b/src/share/replaygain_analysis/Makefile.am
index ccd17a80..9e1ce550 100644
--- a/src/share/replaygain_analysis/Makefile.am
+++ b/src/share/replaygain_analysis/Makefile.am
@@ -8,7 +8,6 @@ libreplaygain_analysis_la_SOURCES = replaygain_analysis.c
 
 EXTRA_DIST = \
 	Makefile.lite \
-	replaygain_analysis_static.dsp \
 	replaygain_analysis_static.vcproj
 
 debug:
diff --git a/src/share/replaygain_analysis/replaygain_analysis_static.dsp b/src/share/replaygain_analysis/replaygain_analysis_static.dsp
deleted file mode 100644
index 59a15e34..00000000
--- a/src/share/replaygain_analysis/replaygain_analysis_static.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="replaygain_analysis_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=replaygain_analysis_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 "replaygain_analysis_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 "replaygain_analysis_static.mak" CFG="replaygain_analysis_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "replaygain_analysis"

-# PROP Scc_LocalPath "..\..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "replaygain_analysis_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 "..\..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\..\include\share" /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "replaygain_analysis_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 "..\..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "replaygain_analysis_static - Win32 Release"

-# Name "replaygain_analysis_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\replaygain_analysis.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\replaygain_analysis.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/share/replaygain_synthesis/Makefile.am b/src/share/replaygain_synthesis/Makefile.am
index 7b95791c..22fbe82c 100644
--- a/src/share/replaygain_synthesis/Makefile.am
+++ b/src/share/replaygain_synthesis/Makefile.am
@@ -10,7 +10,6 @@ libreplaygain_synthesis_la_SOURCES = replaygain_synthesis.c
 
 EXTRA_DIST = \
 	Makefile.lite \
-	replaygain_synthesis_static.dsp \
 	replaygain_synthesis_static.vcproj
 
 debug:
diff --git a/src/share/replaygain_synthesis/replaygain_synthesis_static.dsp b/src/share/replaygain_synthesis/replaygain_synthesis_static.dsp
deleted file mode 100644
index fdad350d..00000000
--- a/src/share/replaygain_synthesis/replaygain_synthesis_static.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="replaygain_synthesis_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=replaygain_synthesis_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 "replaygain_synthesis_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 "replaygain_synthesis_static.mak" CFG="replaygain_synthesis_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "replaygain_synthesis"

-# PROP Scc_LocalPath "..\..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "replaygain_synthesis_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 "..\..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\..\include" /I "..\..\..\include\share" /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "replaygain_synthesis_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 "..\..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /I "..\..\..\include\share" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "replaygain_synthesis_static - Win32 Release"

-# Name "replaygain_synthesis_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\replaygain_synthesis.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\private\fast_float_math_hack.h

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\replaygain_synthesis.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am
index 079a1784..57d5df70 100644
--- a/src/share/utf8/Makefile.am
+++ b/src/share/utf8/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
 	charset_test.c \
 	charsetmap.h \
 	iconvert.h \
-	utf8_static.dsp \
 	utf8_static.vcproj
 
 debug:
diff --git a/src/share/utf8/utf8_static.dsp b/src/share/utf8/utf8_static.dsp
deleted file mode 100644
index 14acf2fb..00000000
--- a/src/share/utf8/utf8_static.dsp
+++ /dev/null
@@ -1,116 +0,0 @@
-# Microsoft Developer Studio Project File - Name="utf8_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=utf8_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 "utf8_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 "utf8_static.mak" CFG="utf8_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "utf8"

-# PROP Scc_LocalPath "..\..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "utf8_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 "..\..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I "..\..\..\include" /I "..\..\..\include\share" /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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "utf8_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 "..\..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /I "..\..\..\include\share" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "utf8_static - Win32 Release"

-# Name "utf8_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\charset.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\iconvert.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\utf8.c

-# End Source File

-# End Group

-# Begin Group "Private Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Protected Header Files"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\include\share\utf8.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am
index 6d1766ab..cb3cf510 100644
--- a/src/test_grabbag/cuesheet/Makefile.am
+++ b/src/test_grabbag/cuesheet/Makefile.am
@@ -17,7 +17,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_cuesheet.dsp \
 	test_cuesheet.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
diff --git a/src/test_grabbag/cuesheet/test_cuesheet.dsp b/src/test_grabbag/cuesheet/test_cuesheet.dsp
deleted file mode 100644
index 2f339927..00000000
--- a/src/test_grabbag/cuesheet/test_cuesheet.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cuesheet" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_cuesheet - 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 "test_cuesheet.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 "test_cuesheet.mak" CFG="test_cuesheet - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_cuesheet - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_cuesheet - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_cuesheet - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\objs\release\lib\grabbag_static.lib ..\..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\..\objs\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_cuesheet - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\objs\debug\lib\grabbag_static.lib ..\..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\..\objs\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_cuesheet - Win32 Release"

-# Name "test_cuesheet - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am
index e5ce8f5b..0a57adf0 100644
--- a/src/test_grabbag/picture/Makefile.am
+++ b/src/test_grabbag/picture/Makefile.am
@@ -17,12 +17,13 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_picture.dsp \
 	test_picture.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = test_picture
 test_picture_SOURCES = \
 	main.c
+
 test_picture_LDADD = \
 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
diff --git a/src/test_grabbag/picture/test_picture.dsp b/src/test_grabbag/picture/test_picture.dsp
deleted file mode 100644
index 5450c315..00000000
--- a/src/test_grabbag/picture/test_picture.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_picture" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_picture - 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 "test_picture.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 "test_picture.mak" CFG="test_picture - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_picture - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_picture - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_picture - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\objs\release\lib\grabbag_static.lib ..\..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\..\objs\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_picture - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\objs\debug\lib\grabbag_static.lib ..\..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\..\objs\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_picture - Win32 Release"

-# Name "test_picture - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 5c0e437d..b87c96cb 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -17,8 +17,8 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_libFLAC++.dsp \
 	test_libFLAC++.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = test_libFLAC++
 test_libFLAC___LDADD = \
diff --git a/src/test_libFLAC++/test_libFLAC++.dsp b/src/test_libFLAC++/test_libFLAC++.dsp
deleted file mode 100644
index adc53e07..00000000
--- a/src/test_libFLAC++/test_libFLAC++.dsp
+++ /dev/null
@@ -1,136 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_libFLAC++" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_libFLAC++ - 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 "test_libFLAC++.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 "test_libFLAC++.mak" CFG="test_libFLAC++ - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_libFLAC++ - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_libFLAC++ - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_libFLAC++ - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\grabbag_static.lib ..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\objs\release\lib\test_libs_common_static.lib ..\..\objs\release\lib\libFLAC++_static.lib ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_libFLAC++ - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\grabbag_static.lib ..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\objs\debug\lib\test_libs_common_static.lib ..\..\objs\debug\lib\libFLAC++_static.lib ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_libFLAC++ - Win32 Release"

-# Name "test_libFLAC++ - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\decoders.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\encoders.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_manip.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_object.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\decoders.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\encoders.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Target

-# End Project

diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 3a6a26ed..fec53113 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -17,7 +17,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_libFLAC.dsp \
 	test_libFLAC.vcproj
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include
diff --git a/src/test_libFLAC/test_libFLAC.dsp b/src/test_libFLAC/test_libFLAC.dsp
deleted file mode 100644
index 01e9e278..00000000
--- a/src/test_libFLAC/test_libFLAC.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_libFLAC" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_libFLAC - 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 "test_libFLAC.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 "test_libFLAC.mak" CFG="test_libFLAC - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_libFLAC - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_libFLAC - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_libFLAC - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\libFLAC\include" /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\grabbag_static.lib ..\..\objs\release\lib\replaygain_analysis_static.lib ..\..\objs\release\lib\test_libs_common_static.lib ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_libFLAC - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\libFLAC\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\grabbag_static.lib ..\..\objs\debug\lib\replaygain_analysis_static.lib ..\..\objs\debug\lib\test_libs_common_static.lib ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_libFLAC - Win32 Release"

-# Name "test_libFLAC - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\bitwriter.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\decoders.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\encoders.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\format.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_manip.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_object.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=.\bitwriter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\decoders.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\encoders.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\format.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/test_libs_common/Makefile.am b/src/test_libs_common/Makefile.am
index 0de5792e..00df8dd1 100644
--- a/src/test_libs_common/Makefile.am
+++ b/src/test_libs_common/Makefile.am
@@ -26,5 +26,4 @@ libtest_libs_common_la_SOURCES = \
 EXTRA_DIST = \
 	Makefile.lite \
 	README \
-	test_libs_common_static.dsp \
 	test_libs_common_static.vcproj
diff --git a/src/test_libs_common/test_libs_common_static.dsp b/src/test_libs_common/test_libs_common_static.dsp
deleted file mode 100644
index 100effd3..00000000
--- a/src/test_libs_common/test_libs_common_static.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_libs_common_static" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=test_libs_common_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 "test_libs_common_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 "test_libs_common_static.mak" CFG="test_libs_common_static - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "test_libs_common"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_libs_common_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 "..\..\objs\release\lib"

-# PROP Intermediate_Dir "Release_static"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\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 /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "test_libs_common_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 "..\..\objs\debug\lib"

-# PROP Intermediate_Dir "Debug_static"

-# 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 /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /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 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_libs_common_static - Win32 Release"

-# Name "test_libs_common_static - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\file_utils_flac.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\metadata_utils.c

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\include\test_libs_common\file_utils_flac.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\test_libs_common\metadata_utils.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am
index 23f2c6cf..22e8aa81 100644
--- a/src/test_seeking/Makefile.am
+++ b/src/test_seeking/Makefile.am
@@ -17,7 +17,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_seeking.dsp \
 	test_seeking.vcproj
 
 AM_CFLAGS = @OGG_CFLAGS@
diff --git a/src/test_seeking/test_seeking.dsp b/src/test_seeking/test_seeking.dsp
deleted file mode 100644
index e8f996c3..00000000
--- a/src/test_seeking/test_seeking.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_seeking" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_seeking - 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 "test_seeking.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 "test_seeking.mak" CFG="test_seeking - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_seeking - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_seeking - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_seeking - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\objs\release\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_seeking - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\objs\debug\lib\libFLAC_static.lib ..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_seeking - Win32 Release"

-# Name "test_seeking - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index b9d903a8..801be9bc 100644
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -17,10 +17,11 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_streams.dsp \
 	test_streams.vcproj
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \
 	main.c
+
 test_streams_LDADD = -lm
diff --git a/src/test_streams/test_streams.dsp b/src/test_streams/test_streams.dsp
deleted file mode 100644
index 6795c2a2..00000000
--- a/src/test_streams/test_streams.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_streams" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_streams - 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 "test_streams.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 "test_streams.mak" CFG="test_streams - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_streams - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "test_streams - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_streams - 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 "..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_streams - 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 "..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_streams - Win32 Release"

-# Name "test_streams - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "c"

-# Begin Source File

-

-SOURCE=.\main.c

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am
index 0c6e24a9..de312c2e 100644
--- a/src/utils/flacdiff/Makefile.am
+++ b/src/utils/flacdiff/Makefile.am
@@ -17,6 +17,5 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	flacdiff.dsp \
 	flacdiff.vcproj \
 	main.cpp
diff --git a/src/utils/flacdiff/flacdiff.dsp b/src/utils/flacdiff/flacdiff.dsp
deleted file mode 100644
index 6495efa9..00000000
--- a/src/utils/flacdiff/flacdiff.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flacdiff" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=flacdiff - 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 "flacdiff.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 "flacdiff.mak" CFG="flacdiff - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "flacdiff - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "flacdiff - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "flacdiff - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ..\..\..\objs\release\lib\libFLAC++_static.lib ..\..\..\objs\release\lib\libFLAC_static.lib ..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "flacdiff - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\..\objs\debug\lib\libFLAC++_static.lib ..\..\..\objs\debug\lib\libFLAC_static.lib ..\..\..\objs\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "flacdiff - Win32 Release"

-# Name "flacdiff - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project

diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am
index f6b69466..00124fd2 100644
--- a/src/utils/flactimer/Makefile.am
+++ b/src/utils/flactimer/Makefile.am
@@ -16,6 +16,5 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
-	flactimer.dsp \
 	flactimer.vcproj \
 	main.cpp
diff --git a/src/utils/flactimer/flactimer.dsp b/src/utils/flactimer/flactimer.dsp
deleted file mode 100644
index e8abb135..00000000
--- a/src/utils/flactimer/flactimer.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="flactimer" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=flactimer - 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 "flactimer.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 "flactimer.mak" CFG="flactimer - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "flactimer - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "flactimer - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "flactimer - 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 "..\..\..\objs\release\bin"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /machine:I386

-# ADD LINK32 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "flactimer - 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 "..\..\..\objs\debug\bin"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

-# SUBTRACT CPP /YX /Yc /Yu

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "flactimer - Win32 Release"

-# Name "flactimer - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# End Group

-# End Target

-# End Project