From bfc8e319c21b378a4dae6ba495fb757c9ded6400 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Thu, 21 Nov 2002 09:00:25 +0000 Subject: [PATCH] revamp MSVC build system, separate dynamic and static builds, separate debug and release intermediate directories --- FLAC.dsw | 259 +++++++++++-- Makefile.am | 3 + all.dsp | 8 +- all_dynamic.dsp | 67 ++++ all_static.dsp | 67 ++++ include/share/gain_analysis.h | 27 +- include/share/getopt.h | 33 +- include/share/grabbag.h | 16 - include/share/grabbag/cuesheet.h | 4 +- include/share/grabbag/file.h | 14 +- include/share/grabbag/replaygain.h | 30 +- include/share/grabbag/seektable.h | 2 +- include/share/utf8.h | 23 +- src/flac/flac.dsp | 12 +- src/libFLAC++/Makefile.am | 3 +- .../{libFLAC++.dsp => libFLAC++_dynamic.dsp} | 36 +- src/libFLAC++/libFLAC++_static.dsp | 148 ++++++++ src/libFLAC/Makefile.am | 3 +- src/libFLAC/{libFLAC.dsp => libFLAC_dynamic.dsp} | 52 +-- src/libFLAC/libFLAC_static.dsp | 418 +++++++++++++++++++++ src/libFLAC/metadata_iterators.c | 4 +- src/libFLAC/metadata_object.c | 2 +- src/libOggFLAC++/Makefile.am | 3 +- .../{libOggFLAC++.dsp => libOggFLAC++_dynamic.dsp} | 34 +- src/libOggFLAC++/libOggFLAC++_static.dsp | 124 ++++++ src/libOggFLAC/Makefile.am | 3 +- .../{libOggFLAC.dsp => libOggFLAC_dynamic.dsp} | 36 +- src/libOggFLAC/libOggFLAC_static.dsp | 136 +++++++ src/metaflac/metaflac.dsp | 12 +- src/monkeys_audio_utilities/flac_mac/flac_mac.dsp | 4 +- src/monkeys_audio_utilities/flac_ren/flac_ren.dsp | 4 +- src/plugin_common/Makefile.am | 2 +- src/plugin_common/Makefile.vc | 4 +- src/plugin_common/all.h | 2 - src/plugin_common/canonical_tag.h | 16 +- src/plugin_common/charset.h | 8 +- src/plugin_common/defs.h | 2 - src/plugin_common/dither.h | 4 +- .../{plugin_common.dsp => dynamic.dsp} | 6 +- src/plugin_common/export.h | 37 -- src/plugin_common/id3v1.h | 8 +- src/plugin_common/plugin_common_static.dsp | 164 ++++++++ src/plugin_common/replaygain_synthesis.c | 2 +- src/plugin_common/replaygain_synthesis.h | 6 +- src/plugin_common/vorbiscomment.h | 6 +- src/plugin_winamp2/in_flac.dsp | 8 +- src/plugin_winamp2/in_flac.dsw | 29 -- src/share/gain_analysis/Makefile.am | 2 +- src/share/gain_analysis/Makefile.vc | 4 +- .../{gain_analysis.dsp => dynamic.dsp} | 2 +- src/share/gain_analysis/gain_analysis.c | 5 - src/share/gain_analysis/gain_analysis_static.dsp | 108 ++++++ src/share/getopt/Makefile.am | 2 +- src/share/getopt/Makefile.vc | 4 +- src/share/getopt/{getopt.dsp => dynamic.dsp} | 2 +- src/share/getopt/getopt.c | 12 +- src/share/getopt/getopt1.c | 4 +- src/share/getopt/getopt_static.dsp | 112 ++++++ src/share/grabbag/Makefile.am | 2 +- src/share/grabbag/Makefile.vc | 4 +- src/share/grabbag/cuesheet.c | 6 +- src/share/grabbag/{grabbag.dsp => dynamic.dsp} | 2 +- src/share/grabbag/file.c | 14 +- src/share/grabbag/grabbag_static.dsp | 136 +++++++ src/share/grabbag/replaygain.c | 30 +- src/share/grabbag/seektable.c | 2 +- src/share/utf8/Makefile.am | 2 +- src/share/utf8/Makefile.vc | 4 +- src/share/utf8/{utf8.dsp => dynamic.dsp} | 2 +- src/share/utf8/utf8.c | 6 +- src/share/utf8/utf8_static.dsp | 116 ++++++ src/test_libFLAC++/test_libFLAC++.dsp | 12 +- src/test_libFLAC/test_libFLAC.dsp | 12 +- src/test_libOggFLAC++/test_libOggFLAC++.dsp | 12 +- src/test_libOggFLAC/test_libOggFLAC.dsp | 12 +- src/test_streams/test_streams.dsp | 96 +++++ 76 files changed, 2169 insertions(+), 449 deletions(-) create mode 100644 all_dynamic.dsp create mode 100644 all_static.dsp rename src/libFLAC++/{libFLAC++.dsp => libFLAC++_dynamic.dsp} (73%) create mode 100644 src/libFLAC++/libFLAC++_static.dsp rename src/libFLAC/{libFLAC.dsp => libFLAC_dynamic.dsp} (82%) create mode 100644 src/libFLAC/libFLAC_static.dsp rename src/libOggFLAC++/{libOggFLAC++.dsp => libOggFLAC++_dynamic.dsp} (68%) create mode 100644 src/libOggFLAC++/libOggFLAC++_static.dsp rename src/libOggFLAC/{libOggFLAC.dsp => libOggFLAC_dynamic.dsp} (70%) create mode 100644 src/libOggFLAC/libOggFLAC_static.dsp rename src/plugin_common/{plugin_common.dsp => dynamic.dsp} (93%) delete mode 100644 src/plugin_common/export.h create mode 100644 src/plugin_common/plugin_common_static.dsp delete mode 100644 src/plugin_winamp2/in_flac.dsw rename src/share/gain_analysis/{gain_analysis.dsp => dynamic.dsp} (93%) create mode 100644 src/share/gain_analysis/gain_analysis_static.dsp rename src/share/getopt/{getopt.dsp => dynamic.dsp} (94%) create mode 100644 src/share/getopt/getopt_static.dsp rename src/share/grabbag/{grabbag.dsp => dynamic.dsp} (94%) create mode 100644 src/share/grabbag/grabbag_static.dsp rename src/share/utf8/{utf8.dsp => dynamic.dsp} (93%) create mode 100644 src/share/utf8/utf8_static.dsp create mode 100644 src/test_streams/test_streams.dsp diff --git a/FLAC.dsw b/FLAC.dsw index 8c59adb..7796aad 100644 --- a/FLAC.dsw +++ b/FLAC.dsw @@ -12,6 +12,105 @@ 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 flac + 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 grabbag_static + End Project Dependency + Begin Project Dependency + Project_Dep_Name gain_analysis_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 libOggFLAC_dynamic + End Project Dependency + Begin Project Dependency + Project_Dep_Name libOggFLAC_static + End Project Dependency + Begin Project Dependency + Project_Dep_Name libOggFLAC++_dynamic + End Project Dependency + Begin Project Dependency + Project_Dep_Name libOggFLAC++_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_libFLAC + End Project Dependency + Begin Project Dependency + Project_Dep_Name test_libFLAC++ + End Project Dependency + Begin Project Dependency + Project_Dep_Name test_libOggFLAC + End Project Dependency + Begin Project Dependency + Project_Dep_Name test_libOggFLAC++ + 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 flac End Project Dependency Begin Project Dependency @@ -27,31 +126,31 @@ Package=<4> Project_Dep_Name flac_ren End Project Dependency Begin Project Dependency - Project_Dep_Name grabbag + Project_Dep_Name grabbag_static End Project Dependency Begin Project Dependency - Project_Dep_Name gain_analysis + Project_Dep_Name gain_analysis_static End Project Dependency Begin Project Dependency - Project_Dep_Name getopt + Project_Dep_Name getopt_static End Project Dependency Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name libFLAC++ + Project_Dep_Name libFLAC++_static End Project Dependency Begin Project Dependency - Project_Dep_Name libOggFLAC + Project_Dep_Name libOggFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name libOggFLAC++ + Project_Dep_Name libOggFLAC++_static End Project Dependency Begin Project Dependency - Project_Dep_Name plugin_common + Project_Dep_Name plugin_common_static End Project Dependency Begin Project Dependency - Project_Dep_Name utf8 + Project_Dep_Name utf8_static End Project Dependency Begin Project Dependency Project_Dep_Name test_libFLAC @@ -65,6 +164,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name test_libOggFLAC++ End Project Dependency + Begin Project Dependency + Project_Dep_Name test_streams + End Project Dependency }}} ############################################################################### @@ -78,22 +180,22 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name grabbag + Project_Dep_Name grabbag_static End Project Dependency Begin Project Dependency - Project_Dep_Name gain_analysis + Project_Dep_Name gain_analysis_static End Project Dependency Begin Project Dependency - Project_Dep_Name getopt + Project_Dep_Name getopt_static End Project Dependency Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name libOggFLAC + Project_Dep_Name libOggFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name utf8 + Project_Dep_Name utf8_static End Project Dependency }}} @@ -123,7 +225,7 @@ Package=<4> ############################################################################### -Project: "gain_analysis"=.\src\share\gain_analysis\gain_analysis.dsp - Package Owner=<4> +Project: "gain_analysis_static"=.\src\share\gain_analysis\gain_analysis_static.dsp - Package Owner=<4> Package=<5> {{{ @@ -135,7 +237,7 @@ Package=<4> ############################################################################### -Project: "getopt"=.\src\share\getopt\getopt.dsp - Package Owner=<4> +Project: "getopt_static"=.\src\share\getopt\getopt_static.dsp - Package Owner=<4> Package=<5> {{{ @@ -147,7 +249,7 @@ Package=<4> ############################################################################### -Project: "grabbag"=.\src\share\grabbag\grabbag.dsp - Package Owner=<4> +Project: "grabbag_static"=.\src\share\grabbag\grabbag_static.dsp - Package Owner=<4> Package=<5> {{{ @@ -156,10 +258,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name gain_analysis + Project_Dep_Name gain_analysis_static End Project Dependency }}} @@ -174,16 +276,70 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + 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 plugin_common + Project_Dep_Name libFLAC_static End Project Dependency }}} ############################################################################### -Project: "libFLAC"=.\src\libFLAC\libFLAC.dsp - Package Owner=<4> +Project: "libOggFLAC_dynamic"=.\src\libOggFLAC\libOggFLAC_dynamic.dsp - Package Owner=<4> Package=<5> {{{ @@ -191,11 +347,14 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libFLAC_dynamic + End Project Dependency }}} ############################################################################### -Project: "libFLAC++"=".\src\libFLAC++\libFLAC++.dsp" - Package Owner=<4> +Project: "libOggFLAC_static"=.\src\libOggFLAC\libOggFLAC_static.dsp - Package Owner=<4> Package=<5> {{{ @@ -204,13 +363,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency }}} ############################################################################### -Project: "libOggFLAC"=.\src\libOggFLAC\libOggFLAC.dsp - Package Owner=<4> +Project: "libOggFLAC++_dynamic"=".\src\libOggFLAC++\libOggFLAC++_dynamic.dsp" - Package Owner=<4> Package=<5> {{{ @@ -219,13 +378,16 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libOggFLAC_dynamic + End Project Dependency + Begin Project Dependency + Project_Dep_Name libFLAC++_dynamic End Project Dependency }}} ############################################################################### -Project: "libOggFLAC++"=".\src\libOggFLAC++\libOggFLAC++.dsp" - Package Owner=<4> +Project: "libOggFLAC++_static"=".\src\libOggFLAC++\libOggFLAC++_static.dsp" - Package Owner=<4> Package=<5> {{{ @@ -234,10 +396,10 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libOggFLAC + Project_Dep_Name libOggFLAC_static End Project Dependency Begin Project Dependency - Project_Dep_Name libFLAC++ + Project_Dep_Name libFLAC++_static End Project Dependency }}} @@ -252,22 +414,25 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name gain_analysis + Project_Dep_Name gain_analysis_static End Project Dependency Begin Project Dependency - Project_Dep_Name getopt + Project_Dep_Name getopt_static End Project Dependency Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name grabbag_static End Project Dependency Begin Project Dependency - Project_Dep_Name utf8 + Project_Dep_Name libFLAC_static + End Project Dependency + Begin Project Dependency + Project_Dep_Name utf8_static End Project Dependency }}} ############################################################################### -Project: "plugin_common"=.\src\plugin_common\plugin_common.dsp - Package Owner=<4> +Project: "plugin_common_static"=.\src\plugin_common\plugin_common_static.dsp - Package Owner=<4> Package=<5> {{{ @@ -276,7 +441,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency }}} @@ -291,7 +456,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC + Project_Dep_Name libFLAC_static End Project Dependency }}} @@ -306,7 +471,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libFLAC++ + Project_Dep_Name libFLAC++_static End Project Dependency }}} @@ -321,7 +486,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libOggFLAC + Project_Dep_Name libOggFLAC_static End Project Dependency }}} @@ -336,13 +501,25 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libOggFLAC++ + Project_Dep_Name libOggFLAC++_static End Project Dependency }}} ############################################################################### -Project: "utf8"=.\src\share\utf8\utf8.dsp - Package Owner=<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> {{{ diff --git a/Makefile.am b/Makefile.am index 05fceff..348b89b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,9 @@ EXTRA_DIST = \ FLAC.dsw \ Makefile.lite \ Makefile.vc \ + all.dsp \ + all_dynamic.dsp \ + all_static.dsp \ autogen.sh \ config.rpath \ depcomp \ diff --git a/all.dsp b/all.dsp index fbf3295..9fc561c 100644 --- a/all.dsp +++ b/all.dsp @@ -36,8 +36,8 @@ MTL=midl.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "obj\release" +# PROP Intermediate_Dir "obj\release" # PROP Target_Dir "" !ELSEIF "$(CFG)" == "all - Win32 Debug" @@ -49,8 +49,8 @@ MTL=midl.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "obj\debug" +# PROP Intermediate_Dir "obj\debug" # PROP Target_Dir "" !ENDIF diff --git a/all_dynamic.dsp b/all_dynamic.dsp new file mode 100644 index 0000000..4368bbf --- /dev/null +++ b/all_dynamic.dsp @@ -0,0 +1,67 @@ +# 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 "obj\release" +# PROP Intermediate_Dir "obj\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 "obj\debug" +# PROP Intermediate_Dir "obj\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 new file mode 100644 index 0000000..a56a1c9 --- /dev/null +++ b/all_static.dsp @@ -0,0 +1,67 @@ +# 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 "obj\release" +# PROP Intermediate_Dir "obj\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 "obj\debug" +# PROP Intermediate_Dir "obj\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/include/share/gain_analysis.h b/include/share/gain_analysis.h index 45cef40..6f52dc6 100644 --- a/include/share/gain_analysis.h +++ b/include/share/gain_analysis.h @@ -29,23 +29,6 @@ #ifndef GAIN_ANALYSIS_H #define GAIN_ANALYSIS_H -#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GAIN_ANALYSIS_API - -#else - -#ifdef GAIN_ANALYSIS_API_EXPORTS -#define GAIN_ANALYSIS_API _declspec(dllexport) -#else -#define GAIN_ANALYSIS_API _declspec(dllimport) -#define __LIBNAME__ "gain_analysis.lib" -#pragma comment(lib, __LIBNAME__) -#undef __LIBNAME__ - -#endif -#endif - - #include #define GAIN_NOT_ENOUGH_SAMPLES -24601 @@ -61,11 +44,11 @@ extern "C" { typedef float Float_t; /* Type used for filtering */ -GAIN_ANALYSIS_API int InitGainAnalysis ( long samplefreq ); -GAIN_ANALYSIS_API int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels ); -GAIN_ANALYSIS_API int ResetSampleFrequency ( long samplefreq ); -GAIN_ANALYSIS_API Float_t GetTitleGain ( void ); -GAIN_ANALYSIS_API Float_t GetAlbumGain ( void ); +int InitGainAnalysis ( long samplefreq ); +int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels ); +int ResetSampleFrequency ( long samplefreq ); +Float_t GetTitleGain ( void ); +Float_t GetAlbumGain ( void ); #ifdef __cplusplus } diff --git a/include/share/getopt.h b/include/share/getopt.h index 06d2d78..024d72d 100644 --- a/include/share/getopt.h +++ b/include/share/getopt.h @@ -34,23 +34,6 @@ #ifndef SHARE__GETOPT_H #define SHARE__GETOPT_H -#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GETOPT_API - -#else - -#ifdef GETOPT_API_EXPORTS -#define GETOPT_API _declspec(dllexport) -#else -#define GETOPT_API _declspec(dllimport) -#define __LIBNAME__ "getopt.lib" -#pragma comment(lib, __LIBNAME__) -#undef __LIBNAME__ - -#endif -#endif - - /*[JEC] was:#ifndef __need_getopt*/ /*[JEC] was:# define _GETOPT_H 1*/ /*[JEC] was:#endif*/ @@ -65,7 +48,7 @@ extern "C" { Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ -GETOPT_API extern char *share__optarg; +extern char *share__optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -79,16 +62,16 @@ GETOPT_API extern char *share__optarg; Otherwise, `share__optind' communicates from one call to the next how much of ARGV has been scanned so far. */ -GETOPT_API extern int share__optind; +extern int share__optind; /* Callers store zero here to inhibit the error message `share__getopt' prints for unrecognized options. */ -GETOPT_API extern int share__opterr; +extern int share__opterr; /* Set to an option character which was unrecognized. */ -GETOPT_API extern int share__optopt; +extern int share__optopt; /*[JEC] was:#ifndef __need_getopt */ /* Describe the long-named options requested by the application. @@ -163,20 +146,20 @@ struct share__option /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -GETOPT_API extern int share__getopt (int __argc, char *const *__argv, const char *__shortopts); +extern int share__getopt (int __argc, char *const *__argv, const char *__shortopts); /*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */ /*[JEC] was:extern int getopt ();*/ /*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */ /*[JEC] was:# ifndef __need_getopt*/ -GETOPT_API extern int share__getopt_long (int __argc, char *const *__argv, const char *__shortopts, +extern int share__getopt_long (int __argc, char *const *__argv, const char *__shortopts, const struct share__option *__longopts, int *__longind); -GETOPT_API extern int share__getopt_long_only (int __argc, char *const *__argv, +extern int share__getopt_long_only (int __argc, char *const *__argv, const char *__shortopts, const struct share__option *__longopts, int *__longind); /* Internal only. Users should not call this directly. */ -GETOPT_API extern int share___getopt_internal (int __argc, char *const *__argv, +extern int share___getopt_internal (int __argc, char *const *__argv, const char *__shortopts, const struct share__option *__longopts, int *__longind, int __long_only); diff --git a/include/share/grabbag.h b/include/share/grabbag.h index 6ef4fc0..28a153b 100644 --- a/include/share/grabbag.h +++ b/include/share/grabbag.h @@ -19,22 +19,6 @@ #ifndef SHARE__GRABBAG_H #define SHARE__GRABBAG_H -#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GRABBAG_API - -#else - -#ifdef GRABBAG_API_EXPORTS -#define GRABBAG_API _declspec(dllexport) -#else -#define GRABBAG_API _declspec(dllimport) -#define __LIBNAME__ "grabbag.lib" -#pragma comment(lib, __LIBNAME__) -#undef __LIBNAME__ - -#endif -#endif - /* These can't be included by themselves, only from within grabbag.h */ #include "grabbag/cuesheet.h" #include "grabbag/file.h" diff --git a/include/share/grabbag/cuesheet.h b/include/share/grabbag/cuesheet.h index d83fdc7..deef8a8 100644 --- a/include/share/grabbag/cuesheet.h +++ b/include/share/grabbag/cuesheet.h @@ -25,8 +25,8 @@ extern "C" { #endif -GRABBAG_API unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames); -GRABBAG_API void grabbag__cuesheet_frame_to_msf(unsigned frame, unsigned *minutes, unsigned *seconds, unsigned *frames); +unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames); +void grabbag__cuesheet_frame_to_msf(unsigned frame, unsigned *minutes, unsigned *seconds, unsigned *frames); #ifdef __cplusplus } diff --git a/include/share/grabbag/file.h b/include/share/grabbag/file.h index 77ae213..427d304 100644 --- a/include/share/grabbag/file.h +++ b/include/share/grabbag/file.h @@ -31,21 +31,21 @@ extern "C" { #endif -GRABBAG_API void grabbag__file_copy_metadata(const char *srcpath, const char *destpath); -GRABBAG_API off_t grabbag__file_get_filesize(const char *srcpath); -GRABBAG_API const char *grabbag__file_get_basename(const char *srcpath); +void grabbag__file_copy_metadata(const char *srcpath, const char *destpath); +off_t grabbag__file_get_filesize(const char *srcpath); +const char *grabbag__file_get_basename(const char *srcpath); /* read_only == false means "make file writable by user" * read_only == true means "make file read-only for everyone" */ -GRABBAG_API FLAC__bool grabbag__file_change_stats(const char *filename, FLAC__bool read_only); +FLAC__bool grabbag__file_change_stats(const char *filename, FLAC__bool read_only); /* attempts to make writable before unlinking */ -GRABBAG_API FLAC__bool grabbag__file_remove_file(const char *filename); +FLAC__bool grabbag__file_remove_file(const char *filename); /* these will forcibly set stdin/stdout to binary mode (for OSes that require it) */ -GRABBAG_API FILE *grabbag__file_get_binary_stdin(); -GRABBAG_API FILE *grabbag__file_get_binary_stdout(); +FILE *grabbag__file_get_binary_stdin(); +FILE *grabbag__file_get_binary_stdout(); #ifdef __cplusplus } diff --git a/include/share/grabbag/replaygain.h b/include/share/grabbag/replaygain.h index ac4d34d..1a368a7 100644 --- a/include/share/grabbag/replaygain.h +++ b/include/share/grabbag/replaygain.h @@ -33,29 +33,29 @@ extern "C" { #endif -extern GRABBAG_API const unsigned GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; +extern const unsigned GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; -GRABBAG_API FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency); +FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency); -GRABBAG_API FLAC__bool grabbag__replaygain_init(unsigned sample_frequency); +FLAC__bool grabbag__replaygain_init(unsigned sample_frequency); /* 'bps' must be valid for FLAC, i.e. >=4 and <= 32 */ -GRABBAG_API FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples); +FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples); -GRABBAG_API void grabbag__replaygain_get_album(float *gain, float *peak); -GRABBAG_API void grabbag__replaygain_get_title(float *gain, float *peak); +void grabbag__replaygain_get_album(float *gain, float *peak); +void grabbag__replaygain_get_title(float *gain, float *peak); /* These three functions return an error string on error, or NULL if successful */ -GRABBAG_API const char *grabbag__replaygain_analyze_file(const char *filename, float *title_gain, float *title_peak); -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment(FLAC__StreamMetadata *block, float album_gain, float album_peak, float title_gain, float title_peak); -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment_album(FLAC__StreamMetadata *block, float album_gain, float album_peak); -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment_title(FLAC__StreamMetadata *block, float title_gain, float title_peak); -GRABBAG_API const char *grabbag__replaygain_store_to_file(const char *filename, float album_gain, float album_peak, float title_gain, float title_peak, FLAC__bool preserve_modtime); -GRABBAG_API const char *grabbag__replaygain_store_to_file_album(const char *filename, float album_gain, float album_peak, FLAC__bool preserve_modtime); -GRABBAG_API const char *grabbag__replaygain_store_to_file_title(const char *filename, float title_gain, float title_peak, FLAC__bool preserve_modtime); +const char *grabbag__replaygain_analyze_file(const char *filename, float *title_gain, float *title_peak); +const char *grabbag__replaygain_store_to_vorbiscomment(FLAC__StreamMetadata *block, float album_gain, float album_peak, float title_gain, float title_peak); +const char *grabbag__replaygain_store_to_vorbiscomment_album(FLAC__StreamMetadata *block, float album_gain, float album_peak); +const char *grabbag__replaygain_store_to_vorbiscomment_title(FLAC__StreamMetadata *block, float title_gain, float title_peak); +const char *grabbag__replaygain_store_to_file(const char *filename, float album_gain, float album_peak, float title_gain, float title_peak, FLAC__bool preserve_modtime); +const char *grabbag__replaygain_store_to_file_album(const char *filename, float album_gain, float album_peak, FLAC__bool preserve_modtime); +const char *grabbag__replaygain_store_to_file_title(const char *filename, float title_gain, float title_peak, FLAC__bool preserve_modtime); -GRABBAG_API FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadata *block, FLAC__bool album_mode, double *gain, double *peak); -GRABBAG_API double grabbag__replaygain_compute_scale_factor(double peak, double gain, double preamp, FLAC__bool prevent_clipping); +FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadata *block, FLAC__bool album_mode, double *gain, double *peak); +double grabbag__replaygain_compute_scale_factor(double peak, double gain, double preamp, FLAC__bool prevent_clipping); #ifdef __cplusplus } diff --git a/include/share/grabbag/seektable.h b/include/share/grabbag/seektable.h index 3f3a2d4..c134860 100644 --- a/include/share/grabbag/seektable.h +++ b/include/share/grabbag/seektable.h @@ -29,7 +29,7 @@ extern "C" { #endif -GRABBAG_API FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec, FLAC__bool only_explicit_placeholders, FLAC__uint64 total_samples_to_encode, unsigned sample_rate, FLAC__StreamMetadata *seektable_template, FLAC__bool *spec_has_real_points); +FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec, FLAC__bool only_explicit_placeholders, FLAC__uint64 total_samples_to_encode, unsigned sample_rate, FLAC__StreamMetadata *seektable_template, FLAC__bool *spec_has_real_points); #ifdef __cplusplus } diff --git a/include/share/utf8.h b/include/share/utf8.h index a9e78be..6aa0e98 100644 --- a/include/share/utf8.h +++ b/include/share/utf8.h @@ -1,23 +1,6 @@ #ifndef SHARE__UTF8_H #define SHARE__UTF8_H -#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) -#define UTF8_API - -#else - -#ifdef UTF8_API_EXPORTS -#define UTF8_API _declspec(dllexport) -#else -#define UTF8_API _declspec(dllimport) -#define __LIBNAME__ "utf8.lib" -#pragma comment(lib, __LIBNAME__) -#undef __LIBNAME__ - -#endif -#endif - - /* * Convert a string between UTF-8 and the locale's charset. * Invalid bytes are replaced by '#', and characters that are @@ -36,9 +19,9 @@ * 3 : unknown encoding (but still converted, using '?') */ -UTF8_API void convert_set_charset(const char *charset); +void convert_set_charset(const char *charset); -UTF8_API int utf8_encode(const char *from, char **to); -UTF8_API int utf8_decode(const char *from, char **to); +int utf8_encode(const char *from, char **to); +int utf8_decode(const char *from, char **to); #endif diff --git a/src/flac/flac.dsp b/src/flac/flac.dsp index e9a2723..6b20fd8 100644 --- a/src/flac/flac.dsp +++ b/src/flac/flac.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GX /O2 /I "." /I "..\..\include" /D "NDEBUG" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\ogg_static.lib ..\..\obj\lib\grabbag.lib ..\..\obj\lib\gain_analysis.lib ..\..\obj\lib\getopt.lib ..\..\obj\lib\utf8.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\getopt_static.lib ..\..\obj\release\lib\utf8_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "flac - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /D "_DEBUG" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\ogg_static.lib ..\..\obj\lib\grabbag.lib ..\..\obj\lib\gain_analysis.lib ..\..\obj\lib\getopt.lib ..\..\obj\lib\utf8.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\getopt_static.lib ..\..\obj\debug\lib\utf8_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index 80a8789..cc82315 100644 --- a/src/libFLAC++/Makefile.am +++ b/src/libFLAC++/Makefile.am @@ -25,7 +25,8 @@ m4data_DATA = libFLAC++.m4 EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - libFLAC++.dsp \ + libFLAC++_dynamic.dsp \ + libFLAC++_static.dsp \ libFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention diff --git a/src/libFLAC++/libFLAC++.dsp b/src/libFLAC++/libFLAC++_dynamic.dsp similarity index 73% rename from src/libFLAC++/libFLAC++.dsp rename to src/libFLAC++/libFLAC++_dynamic.dsp index 8af0469..23ecc2a 100644 --- a/src/libFLAC++/libFLAC++.dsp +++ b/src/libFLAC++/libFLAC++_dynamic.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libFLAC++" - Package Owner=<4> +# 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++ - Win32 Debug +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++.mak". +!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++.mak" CFG="libFLAC++ - Win32 Debug" +!MESSAGE NMAKE /f "libFLAC++_dynamic.mak" CFG="libFLAC++_dynamic - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libFLAC++ - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libFLAC++ - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!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 @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libFLAC++ - Win32 Release" +!IF "$(CFG)" == "libFLAC++_dynamic - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\..\obj\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 @@ -53,9 +53,9 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/libFLAC++.dll" +# ADD LINK32 ..\..\obj\release\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC++.dll" -!ELSEIF "$(CFG)" == "libFLAC++ - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC++_dynamic - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\obj\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 "_CHATTER" /D "FLACPP_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /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" @@ -79,17 +79,17 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/libFLAC++.dll" /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC++.dll" /pdbtype:sept !ENDIF # Begin Target -# Name "libFLAC++ - Win32 Release" -# Name "libFLAC++ - Win32 Debug" +# Name "libFLAC++_dynamic - Win32 Release" +# Name "libFLAC++_dynamic - Win32 Debug" # Begin Group "Source Files" -# PROP Default_Filter "cc" +# PROP Default_Filter "cpp" # Begin Source File SOURCE=.\file_decoder.cpp diff --git a/src/libFLAC++/libFLAC++_static.dsp b/src/libFLAC++/libFLAC++_static.dsp new file mode 100644 index 0000000..7ffafe0 --- /dev/null +++ b/src/libFLAC++/libFLAC++_static.dsp @@ -0,0 +1,148 @@ +# 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 "..\..\obj\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 /W3 /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 /out:"..\..\obj\release\lib/libFLAC++_static.lib" + +!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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\obj\debug\lib/libFLAC++_static.lib" + +!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=.\file_decoder.cpp +# End Source File +# Begin Source File + +SOURCE=.\file_encoder.cpp +# End Source File +# Begin Source File + +SOURCE=.\metadata.cpp +# End Source File +# Begin Source File + +SOURCE=.\seekable_stream_decoder.cpp +# End Source File +# Begin Source File + +SOURCE=.\seekable_stream_encoder.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 11ce679..a039af9 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -40,7 +40,8 @@ m4data_DATA = libFLAC.m4 EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - libFLAC.dsp \ + libFLAC_dynamic.dsp \ + libFLAC_static.dsp \ libFLAC.m4 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention diff --git a/src/libFLAC/libFLAC.dsp b/src/libFLAC/libFLAC_dynamic.dsp similarity index 82% rename from src/libFLAC/libFLAC.dsp rename to src/libFLAC/libFLAC_dynamic.dsp index 32471c4..626d085 100644 --- a/src/libFLAC/libFLAC.dsp +++ b/src/libFLAC/libFLAC_dynamic.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libFLAC" - Package Owner=<4> +# 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 - Win32 Debug +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.mak". +!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.mak" CFG="libFLAC - Win32 Debug" +!MESSAGE NMAKE /f "libFLAC_dynamic.mak" CFG="libFLAC_dynamic - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libFLAC - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libFLAC - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!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 @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libFLAC - Win32 Release" +!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\..\obj\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 @@ -53,9 +53,9 @@ BSC32=bscmake.exe # 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 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/libFLAC.dll" +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll" -!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\obj\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 "_CHATTER" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /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" @@ -79,17 +79,17 @@ BSC32=bscmake.exe # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/libFLAC.dll" /pdbtype:sept +# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept !ENDIF # Begin Target -# Name "libFLAC - Win32 Release" -# Name "libFLAC - Win32 Debug" +# Name "libFLAC_dynamic - Win32 Release" +# Name "libFLAC_dynamic - Win32 Debug" # Begin Group "Source Files" -# PROP Default_Filter "cpp" +# PROP Default_Filter "c" # Begin Group "Assembly Files (ia32)" # PROP Default_Filter "" @@ -97,7 +97,7 @@ LINK32=link.exe SOURCE=.\ia32\cpu_asm.nasm -!IF "$(CFG)" == "libFLAC - Win32 Release" +!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release" USERDEP__CPU_A="ia32/cpu_asm.nasm" # Begin Custom Build @@ -108,7 +108,7 @@ InputPath=.\ia32\cpu_asm.nasm # End Custom Build -!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug" USERDEP__CPU_A="ia32/cpu_asm.nasm" # Begin Custom Build @@ -126,7 +126,7 @@ InputPath=.\ia32\cpu_asm.nasm SOURCE=.\ia32\fixed_asm.nasm -!IF "$(CFG)" == "libFLAC - Win32 Release" +!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release" USERDEP__FIXED="ia32/fixed_asm.nasm" # Begin Custom Build @@ -137,7 +137,7 @@ InputPath=.\ia32\fixed_asm.nasm # End Custom Build -!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug" USERDEP__FIXED="ia32/fixed_asm.nasm" # Begin Custom Build @@ -155,7 +155,7 @@ InputPath=.\ia32\fixed_asm.nasm SOURCE=.\ia32\lpc_asm.nasm -!IF "$(CFG)" == "libFLAC - Win32 Release" +!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release" USERDEP__LPC_A="ia32/lpc_asm.nasm" # Begin Custom Build @@ -166,7 +166,7 @@ InputPath=.\ia32\lpc_asm.nasm # End Custom Build -!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug" USERDEP__LPC_A="ia32/lpc_asm.nasm" # Begin Custom Build @@ -377,7 +377,7 @@ SOURCE=..\..\include\FLAC\metadata.h SOURCE=..\..\include\FLAC\ordinals.h.in -!IF "$(CFG)" == "libFLAC - Win32 Release" +!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release" USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in" # Begin Custom Build @@ -389,7 +389,7 @@ InputPath=..\..\include\FLAC\ordinals.h.in # End Custom Build -!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug" USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in" # Begin Custom Build diff --git a/src/libFLAC/libFLAC_static.dsp b/src/libFLAC/libFLAC_static.dsp new file mode 100644 index 0000000..9a73180 --- /dev/null +++ b/src/libFLAC/libFLAC_static.dsp @@ -0,0 +1,418 @@ +# 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 "..\..\obj\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 /W3 /GX /O2 /I ".\include" /I "..\..\include" /D VERSION=\"1.0.4\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /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 /nodefaultlib /nologo /out:"..\..\obj\release\lib/libFLAC_static.lib" + +!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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.0.4\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\debug\lib/libFLAC_static.lib" + +!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\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)" + %FLAC_NASM% -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)" + %FLAC_NASM% -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)" + %FLAC_NASM% -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)" + %FLAC_NASM% -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)" + %FLAC_NASM% -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)" + %FLAC_NASM% -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\nasm.h +# End Source File +# End Group +# Begin Source File + +SOURCE=.\bitbuffer.c +# End Source File +# Begin Source File + +SOURCE=.\bitmath.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=.\file_decoder.c +# End Source File +# Begin Source File + +SOURCE=.\file_encoder.c +# End Source File +# Begin Source File + +SOURCE=.\fixed.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=.\seekable_stream_decoder.c +# End Source File +# Begin Source File + +SOURCE=.\seekable_stream_encoder.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 +# 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\bitbuffer.h +# End Source File +# Begin Source File + +SOURCE=.\include\private\bitmath.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\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\stream_encoder_framing.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\file_decoder.h +# End Source File +# Begin Source File + +SOURCE=.\include\protected\file_encoder.h +# End Source File +# Begin Source File + +SOURCE=.\include\protected\seekable_stream_decoder.h +# End Source File +# Begin Source File + +SOURCE=.\include\protected\seekable_stream_encoder.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\file_decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\FLAC\file_encoder.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.in + +!IF "$(CFG)" == "libFLAC_static - Win32 Release" + +USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in" +# Begin Custom Build +InputDir=\home\Administrator\msvc\flac\include\FLAC +InputPath=..\..\include\FLAC\ordinals.h.in + +"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug" + +USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in" +# Begin Custom Build +InputDir=\home\Administrator\msvc\flac\include\FLAC +InputPath=..\..\include\FLAC\ordinals.h.in + +"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\FLAC\seekable_stream_decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\FLAC\seekable_stream_encoder.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/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index 618e3ba..8d0a326 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -1607,9 +1607,11 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_(FILE *fil { unsigned i, len; FLAC__Metadata_SimpleIteratorStatus status; - FLAC__byte buffer[max(sizeof(FLAC__uint64), FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN/8)]; /* the largest object we'll read in one shot */ + FLAC__byte buffer[1024]; /* MSVC needs a constant expression so we put a magic number and assert */ FLAC__ASSERT(0 != file); + FLAC__ASSERT(FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN/8 <= sizeof(buffer)); + FLAC__ASSERT(sizeof(FLAC__uint64) <= sizeof(buffer)); FLAC__ASSERT(FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN % 8 == 0); len = FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN / 8; diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index aa43f2c..3e3d33e 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -1129,7 +1129,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC { FLAC__StreamMetadata_CueSheet_Index index; memset(&index, 0, sizeof(index)); - return FLAC__metadata_object_cuesheet_track_index_index(object, track_num, index_num, &index); + return FLAC__metadata_object_cuesheet_track_insert_index(object, track_num, index_num, index); } FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num) diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am index 4be26db..6be2491 100644 --- a/src/libOggFLAC++/Makefile.am +++ b/src/libOggFLAC++/Makefile.am @@ -25,7 +25,8 @@ m4data_DATA = libOggFLAC++.m4 EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - libOggFLAC++.dsp \ + libOggFLAC++_dynamic.dsp \ + libOggFLAC++_static.dsp \ libOggFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention diff --git a/src/libOggFLAC++/libOggFLAC++.dsp b/src/libOggFLAC++/libOggFLAC++_dynamic.dsp similarity index 68% rename from src/libOggFLAC++/libOggFLAC++.dsp rename to src/libOggFLAC++/libOggFLAC++_dynamic.dsp index f077143..86aa879 100644 --- a/src/libOggFLAC++/libOggFLAC++.dsp +++ b/src/libOggFLAC++/libOggFLAC++_dynamic.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libOggFLAC++" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="libOggFLAC++_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=libOggFLAC++ - Win32 Debug +CFG=libOggFLAC++_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 "libOggFLAC++.mak". +!MESSAGE NMAKE /f "libOggFLAC++_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 "libOggFLAC++.mak" CFG="libOggFLAC++ - Win32 Debug" +!MESSAGE NMAKE /f "libOggFLAC++_dynamic.mak" CFG="libOggFLAC++_dynamic - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libOggFLAC++ - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libOggFLAC++ - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libOggFLAC++_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libOggFLAC++_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libOggFLAC++ - Win32 Release" +!IF "$(CFG)" == "libOggFLAC++_dynamic - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\..\obj\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 @@ -53,9 +53,9 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/libOggFLAC++.dll" +# ADD LINK32 ..\..\obj\release\lib\libFLAC++.lib ..\..\obj\release\lib\libOggFLAC.lib ..\..\obj\release\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libOggFLAC++.dll" -!ELSEIF "$(CFG)" == "libOggFLAC++ - Win32 Debug" +!ELSEIF "$(CFG)" == "libOggFLAC++_dynamic - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -64,12 +64,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\obj\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 "_CHATTER" /D "OggFLACPP_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "OggFLACPP_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" @@ -79,14 +79,14 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/libOggFLAC++.dll" /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\libFLAC++.lib ..\..\obj\debug\lib\libOggFLAC.lib ..\..\obj\debug\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libOggFLAC++.dll" /pdbtype:sept !ENDIF # Begin Target -# Name "libOggFLAC++ - Win32 Release" -# Name "libOggFLAC++ - Win32 Debug" +# Name "libOggFLAC++_dynamic - Win32 Release" +# Name "libOggFLAC++_dynamic - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp" diff --git a/src/libOggFLAC++/libOggFLAC++_static.dsp b/src/libOggFLAC++/libOggFLAC++_static.dsp new file mode 100644 index 0000000..36b73c5 --- /dev/null +++ b/src/libOggFLAC++/libOggFLAC++_static.dsp @@ -0,0 +1,124 @@ +# Microsoft Developer Studio Project File - Name="libOggFLAC++_static" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libOggFLAC++_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 "libOggFLAC++_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 "libOggFLAC++_static.mak" CFG="libOggFLAC++_static - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libOggFLAC++_static - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libOggFLAC++_static - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "libOggFLAC++" +# PROP Scc_LocalPath "..\.." +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libOggFLAC++_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 "..\..\obj\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 /W3 /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 /out:"..\..\obj\release\lib/libOggFLAC++_static.lib" + +!ELSEIF "$(CFG)" == "libOggFLAC++_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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\obj\debug\lib/libOggFLAC++_static.lib" + +!ENDIF + +# Begin Target + +# Name "libOggFLAC++_static - Win32 Release" +# Name "libOggFLAC++_static - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp" +# 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\OggFLAC++\all.h" +# End Source File +# Begin Source File + +SOURCE="..\..\include\OggFLAC++\decoder.h" +# End Source File +# Begin Source File + +SOURCE="..\..\include\OggFLAC++\encoder.h" +# End Source File +# Begin Source File + +SOURCE="..\..\include\OggFLAC++\export.h" +# End Source File +# End Group +# End Target +# End Project diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am index 7451fc9..06fdd4b 100644 --- a/src/libOggFLAC/Makefile.am +++ b/src/libOggFLAC/Makefile.am @@ -30,7 +30,8 @@ m4data_DATA = libOggFLAC.m4 EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - libOggFLAC.dsp \ + libOggFLAC_dynamic.dsp \ + libOggFLAC_static.dsp \ libOggFLAC.m4 libOggFLAC_la_LIBADD = @OGG_LIBS@ diff --git a/src/libOggFLAC/libOggFLAC.dsp b/src/libOggFLAC/libOggFLAC_dynamic.dsp similarity index 70% rename from src/libOggFLAC/libOggFLAC.dsp rename to src/libOggFLAC/libOggFLAC_dynamic.dsp index 8b15e4c..debb0ab 100644 --- a/src/libOggFLAC/libOggFLAC.dsp +++ b/src/libOggFLAC/libOggFLAC_dynamic.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libOggFLAC" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="libOggFLAC_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=libOggFLAC - Win32 Debug +CFG=libOggFLAC_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 "libOggFLAC.mak". +!MESSAGE NMAKE /f "libOggFLAC_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 "libOggFLAC.mak" CFG="libOggFLAC - Win32 Debug" +!MESSAGE NMAKE /f "libOggFLAC_dynamic.mak" CFG="libOggFLAC_dynamic - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libOggFLAC - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libOggFLAC - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libOggFLAC_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libOggFLAC_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "libOggFLAC - Win32 Release" +!IF "$(CFG)" == "libOggFLAC_dynamic - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\..\obj\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 @@ -53,10 +53,10 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/libOggFLAC.dll" +# ADD LINK32 ..\..\obj\release\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\release\bin/libOggFLAC.dll" # SUBTRACT LINK32 /nodefaultlib -!ELSEIF "$(CFG)" == "libOggFLAC - Win32 Debug" +!ELSEIF "$(CFG)" == "libOggFLAC_dynamic - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -65,12 +65,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\lib" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\obj\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 "_CHATTER" /D "OggFLAC_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "OggFLAC_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" @@ -80,18 +80,18 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/libOggFLAC.dll" /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\debug\bin/libOggFLAC.dll" /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib !ENDIF # Begin Target -# Name "libOggFLAC - Win32 Release" -# Name "libOggFLAC - Win32 Debug" +# Name "libOggFLAC_dynamic - Win32 Release" +# Name "libOggFLAC_dynamic - Win32 Debug" # Begin Group "Source Files" -# PROP Default_Filter "cpp" +# PROP Default_Filter "c" # Begin Source File SOURCE=.\stream_decoder.c diff --git a/src/libOggFLAC/libOggFLAC_static.dsp b/src/libOggFLAC/libOggFLAC_static.dsp new file mode 100644 index 0000000..42b41e5 --- /dev/null +++ b/src/libOggFLAC/libOggFLAC_static.dsp @@ -0,0 +1,136 @@ +# Microsoft Developer Studio Project File - Name="libOggFLAC_static" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libOggFLAC_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 "libOggFLAC_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 "libOggFLAC_static.mak" CFG="libOggFLAC_static - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libOggFLAC_static - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libOggFLAC_static - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "libOggFLAC" +# PROP Scc_LocalPath "..\.." +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libOggFLAC_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 "..\..\obj\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 /W3 /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 /nodefaultlib /nologo /out:"..\..\obj\release\lib/libOggFLAC_static.lib" + +!ELSEIF "$(CFG)" == "libOggFLAC_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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\debug\lib/libOggFLAC_static.lib" + +!ENDIF + +# Begin Target + +# Name "libOggFLAC_static - Win32 Release" +# Name "libOggFLAC_static - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=.\stream_decoder.c +# End Source File +# Begin Source File + +SOURCE=.\stream_encoder.c +# End Source File +# End Group +# Begin Group "Private Header Files" + +# PROP Default_Filter "" +# 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\OggFLAC\all.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\OggFLAC\export.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\OggFLAC\stream_decoder.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\OggFLAC\stream_encoder.h +# End Source File +# End Group +# End Target +# End Project diff --git a/src/metaflac/metaflac.dsp b/src/metaflac/metaflac.dsp index 4c7f380..300be7a 100644 --- a/src/metaflac/metaflac.dsp +++ b/src/metaflac/metaflac.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GX /O2 /I "." /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\grabbag.lib ..\..\obj\lib\gain_analysis.lib ..\..\obj\lib\getopt.lib ..\..\obj\lib\utf8.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\gain_analysis_static.lib ..\..\obj\release\lib\getopt_static.lib ..\..\obj\release\lib\utf8_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "metaflac - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\grabbag.lib ..\..\obj\lib\gain_analysis.lib ..\..\obj\lib\getopt.lib ..\..\obj\lib\utf8.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\debug\lib\gain_analysis_static.lib ..\..\obj\debug\lib\getopt_static.lib ..\..\obj\debug\lib\utf8_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp b/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp index 0254ebb..9d4ce60 100644 --- a/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp +++ b/src/monkeys_audio_utilities/flac_mac/flac_mac.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\obj\bin" +# PROP Output_Dir "..\..\..\obj\release\bin" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -62,7 +62,7 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\obj\bin" +# PROP Output_Dir "..\..\..\obj\debug\bin" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" diff --git a/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp b/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp index 5a2287d..f186a59 100644 --- a/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp +++ b/src/monkeys_audio_utilities/flac_ren/flac_ren.dsp @@ -37,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\obj\bin" +# PROP Output_Dir "..\..\..\obj\release\bin" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -62,7 +62,7 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\obj\bin" +# PROP Output_Dir "..\..\..\obj\debug\bin" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index ac5a84f..bbad027 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -33,7 +33,7 @@ EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ README \ - plugin_common.dsp + plugin_common_static.dsp debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/plugin_common/Makefile.vc b/src/plugin_common/Makefile.vc index e8c3c0b..93070ed 100644 --- a/src/plugin_common/Makefile.vc +++ b/src/plugin_common/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/plugin_common/all.h b/src/plugin_common/all.h index 8c409ac..8249229 100644 --- a/src/plugin_common/all.h +++ b/src/plugin_common/all.h @@ -19,8 +19,6 @@ #ifndef FLAC__PLUGIN_COMMON__ALL_H #define FLAC__PLUGIN_COMMON__ALL_H -#include "export.h" - #include "canonical_tag.h" #include "charset.h" #include "dither.h" diff --git a/src/plugin_common/canonical_tag.h b/src/plugin_common/canonical_tag.h index bcdcc1f..d0c57fd 100644 --- a/src/plugin_common/canonical_tag.h +++ b/src/plugin_common/canonical_tag.h @@ -19,8 +19,6 @@ #ifndef FLAC__PLUGIN_COMMON__CANONICAL_TAG_H #define FLAC__PLUGIN_COMMON__CANONICAL_TAG_H -#include "export.h" - #include "id3v1.h" typedef struct { @@ -36,22 +34,22 @@ typedef struct { char *comment; } FLAC_Plugin__CanonicalTag; -PLUGIN_COMMON_API FLAC_Plugin__CanonicalTag *FLAC_plugin__canonical_tag_new(); -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_delete(FLAC_Plugin__CanonicalTag *); -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_init(FLAC_Plugin__CanonicalTag *); -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_clear(FLAC_Plugin__CanonicalTag *); +FLAC_Plugin__CanonicalTag *FLAC_plugin__canonical_tag_new(); +void FLAC_plugin__canonical_tag_delete(FLAC_Plugin__CanonicalTag *); +void FLAC_plugin__canonical_tag_init(FLAC_Plugin__CanonicalTag *); +void FLAC_plugin__canonical_tag_clear(FLAC_Plugin__CanonicalTag *); /* For each null field in dest, move the corresponding field from src * WATCHOUT: note that src is not-const, because fields are 'moved' from * src to dest and the src field is set to null. */ -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_merge(FLAC_Plugin__CanonicalTag *dest, FLAC_Plugin__CanonicalTag *src); +void FLAC_plugin__canonical_tag_merge(FLAC_Plugin__CanonicalTag *dest, FLAC_Plugin__CanonicalTag *src); -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_convert_from_id3v1(FLAC_Plugin__CanonicalTag *, const FLAC_Plugin__Id3v1_Tag *); +void FLAC_plugin__canonical_tag_convert_from_id3v1(FLAC_Plugin__CanonicalTag *, const FLAC_Plugin__Id3v1_Tag *); /* Returns a merged tag based on any Vorbis comments, id3v2 tag, and id3v1. * In case of overlaps the preceding precedence applies. */ -PLUGIN_COMMON_API void FLAC_plugin__canonical_tag_get_combined(const char *filename, FLAC_Plugin__CanonicalTag *tag); +void FLAC_plugin__canonical_tag_get_combined(const char *filename, FLAC_Plugin__CanonicalTag *tag); #endif diff --git a/src/plugin_common/charset.h b/src/plugin_common/charset.h index 122d521..88e313e 100644 --- a/src/plugin_common/charset.h +++ b/src/plugin_common/charset.h @@ -30,12 +30,10 @@ * Prototypes * **************/ -#include "export.h" - -PLUGIN_COMMON_API char *FLAC_plugin__charset_get_current(); -PLUGIN_COMMON_API char *FLAC_plugin__charset_convert_string(const char *string, char *from, char *to); +char *FLAC_plugin__charset_get_current(); +char *FLAC_plugin__charset_convert_string(const char *string, char *from, char *to); /* returns 1 for success, 0 for failure or no iconv */ -PLUGIN_COMMON_API int FLAC_plugin__charset_test_conversion(char *from, char *to); +int FLAC_plugin__charset_test_conversion(char *from, char *to); #endif diff --git a/src/plugin_common/defs.h b/src/plugin_common/defs.h index 2ef5b9a..6e75897 100644 --- a/src/plugin_common/defs.h +++ b/src/plugin_common/defs.h @@ -19,8 +19,6 @@ #ifndef FLAC__PLUGIN_COMMON__DEFS_H #define FLAC__PLUGIN_COMMON__DEFS_H -#include "export.h" - #define FLAC_PLUGIN__MAX_SUPPORTED_CHANNELS 2 #endif diff --git a/src/plugin_common/dither.h b/src/plugin_common/dither.h index 8f1fce5..f1b7ae3 100644 --- a/src/plugin_common/dither.h +++ b/src/plugin_common/dither.h @@ -19,11 +19,9 @@ #ifndef FLAC__PLUGIN_COMMON__DITHER_H #define FLAC__PLUGIN_COMMON__DITHER_H -#include "export.h" - #include "defs.h" /* buy FLAC_PLUGIN__MAX_SUPPORTED_CHANNELS for the caller */ #include "FLAC/ordinals.h" -PLUGIN_COMMON_API unsigned FLAC__plugin_common__pack_pcm_signed_little_endian(FLAC__byte *data, FLAC__int32 *input, unsigned wide_samples, unsigned channels, unsigned source_bps, unsigned target_bps); +unsigned FLAC__plugin_common__pack_pcm_signed_little_endian(FLAC__byte *data, FLAC__int32 *input, unsigned wide_samples, unsigned channels, unsigned source_bps, unsigned target_bps); #endif diff --git a/src/plugin_common/plugin_common.dsp b/src/plugin_common/dynamic.dsp similarity index 93% rename from src/plugin_common/plugin_common.dsp rename to src/plugin_common/dynamic.dsp index 0fb2ff4..97acf5c 100644 --- a/src/plugin_common/plugin_common.dsp +++ b/src/plugin_common/dynamic.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # 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 "_CHATTER" /D "PLUGIN_COMMON_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "PLUGIN_COMMON_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" @@ -154,10 +154,6 @@ SOURCE=.\dither.h # End Source File # Begin Source File -SOURCE=.\export.h -# End Source File -# Begin Source File - SOURCE=.\id3v1.h # End Source File # Begin Source File diff --git a/src/plugin_common/export.h b/src/plugin_common/export.h deleted file mode 100644 index eb0b634..0000000 --- a/src/plugin_common/export.h +++ /dev/null @@ -1,37 +0,0 @@ -/* plugin_common - Routines common to several plugins - * Copyright (C) 2002 Josh Coalson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef FLAC__PLUGIN_COMMON__EXPORT_H -#define FLAC__PLUGIN_COMMON__EXPORT_H - -#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) -#define PLUGIN_COMMON_API - -#else - -#ifdef PLUGIN_COMMON_API_EXPORTS -#define PLUGIN_COMMON_API _declspec(dllexport) -#else -#define PLUGIN_COMMON_API _declspec(dllimport) -#define __LIBNAME__ "plugin_common.lib" -#pragma comment(lib, __LIBNAME__) -#undef __LIBNAME__ - -#endif -#endif -#endif diff --git a/src/plugin_common/id3v1.h b/src/plugin_common/id3v1.h index 2b78d3a..e74e677 100644 --- a/src/plugin_common/id3v1.h +++ b/src/plugin_common/id3v1.h @@ -21,8 +21,6 @@ #include -#include "export.h" - #include "FLAC/ordinals.h" typedef struct { @@ -44,12 +42,12 @@ typedef struct { unsigned char genre; } FLAC_Plugin__Id3v1_Tag; -PLUGIN_COMMON_API FLAC__bool FLAC_plugin__id3v1_tag_get(const char *filename, FLAC_Plugin__Id3v1_Tag *tag); +FLAC__bool FLAC_plugin__id3v1_tag_get(const char *filename, FLAC_Plugin__Id3v1_Tag *tag); #define FLAC_PLUGIN__ID3V1_TAG_INVALID_GENRE 255 -PLUGIN_COMMON_API const char *FLAC_plugin__id3v1_tag_get_genre_as_string(unsigned char genre_code); -PLUGIN_COMMON_API unsigned FLAC_plugin__id3v1_tag_genre_table_max(); +const char *FLAC_plugin__id3v1_tag_get_genre_as_string(unsigned char genre_code); +unsigned FLAC_plugin__id3v1_tag_genre_table_max(); #endif diff --git a/src/plugin_common/plugin_common_static.dsp b/src/plugin_common/plugin_common_static.dsp new file mode 100644 index 0000000..7888708 --- /dev/null +++ b/src/plugin_common/plugin_common_static.dsp @@ -0,0 +1,164 @@ +# 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 "..\..\obj\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 /W3 /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 /nodefaultlib /nologo /out:"..\..\obj\release\lib/plugin_common_static.lib" + +!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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\debug\lib/plugin_common_static.lib" + +!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=.\canonical_tag.c +# End Source File +# Begin Source File + +SOURCE=.\charset.c +# End Source File +# Begin Source File + +SOURCE=.\dither.c +# End Source File +# Begin Source File + +SOURCE=.\id3v1.c +# End Source File +# Begin Source File + +SOURCE=.\id3v2.c +# End Source File +# Begin Source File + +SOURCE=.\replaygain_synthesis.c +# End Source File +# Begin Source File + +SOURCE=.\vorbiscomment.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 "Protected Header Files" + +# PROP Default_Filter "" +# End Group +# Begin Group "Public Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\all.h +# End Source File +# Begin Source File + +SOURCE=.\canonical_tag.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=.\id3v1.h +# End Source File +# Begin Source File + +SOURCE=.\locale_hack.h +# End Source File +# Begin Source File + +SOURCE=.\replaygain_synthesis.h +# End Source File +# Begin Source File + +SOURCE=.\vorbiscomment.h +# End Source File +# End Group +# End Target +# End Project diff --git a/src/plugin_common/replaygain_synthesis.c b/src/plugin_common/replaygain_synthesis.c index fc34377..677d017 100644 --- a/src/plugin_common/replaygain_synthesis.c +++ b/src/plugin_common/replaygain_synthesis.c @@ -286,7 +286,7 @@ static FLAC__INLINE FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_d #endif -PLUGIN_COMMON_API int FLAC__plugin_common__apply_gain(FLAC__byte *data_out, FLAC__int32 *input, unsigned wide_samples, unsigned channels, const unsigned source_bps, const unsigned target_bps, const float scale, const FLAC__bool hard_limit, FLAC__bool do_dithering, NoiseShaping noise_shaping, DitherContext *dither_context) +int FLAC__plugin_common__apply_gain(FLAC__byte *data_out, FLAC__int32 *input, unsigned wide_samples, unsigned channels, const unsigned source_bps, const unsigned target_bps, const float scale, const FLAC__bool hard_limit, FLAC__bool do_dithering, NoiseShaping noise_shaping, DitherContext *dither_context) { static const FLAC__int32 conv_factors_[33] = { -1, /* 0 bits-per-sample (not supported) */ diff --git a/src/plugin_common/replaygain_synthesis.h b/src/plugin_common/replaygain_synthesis.h index efdc76d..af782e5 100644 --- a/src/plugin_common/replaygain_synthesis.h +++ b/src/plugin_common/replaygain_synthesis.h @@ -19,8 +19,6 @@ #ifndef FLAC__PLUGIN_COMMON__REPLAYGAIN_SYNTHESIS_H #define FLAC__PLUGIN_COMMON__REPLAYGAIN_SYNTHESIS_H -#include "export.h" - #include "defs.h" #include "FLAC/ordinals.h" @@ -41,9 +39,9 @@ typedef enum { NOISE_SHAPING_HIGH = 3 } NoiseShaping; -PLUGIN_COMMON_API void FLAC__plugin_common__init_dither_context(DitherContext *dither, int bits, int shapingtype); +void FLAC__plugin_common__init_dither_context(DitherContext *dither, int bits, int shapingtype); /* scale = (float) pow(10., (double)replaygain * 0.05); */ -PLUGIN_COMMON_API int FLAC__plugin_common__apply_gain(FLAC__byte *data_out, FLAC__int32 *input, unsigned wide_samples, unsigned channels, const unsigned source_bps, const unsigned target_bps, const float scale, const FLAC__bool hard_limit, FLAC__bool do_dithering, NoiseShaping noise_shaping, DitherContext *dither_context); +int FLAC__plugin_common__apply_gain(FLAC__byte *data_out, FLAC__int32 *input, unsigned wide_samples, unsigned channels, const unsigned source_bps, const unsigned target_bps, const float scale, const FLAC__bool hard_limit, FLAC__bool do_dithering, NoiseShaping noise_shaping, DitherContext *dither_context); #endif diff --git a/src/plugin_common/vorbiscomment.h b/src/plugin_common/vorbiscomment.h index dc49dfe..81927e8 100644 --- a/src/plugin_common/vorbiscomment.h +++ b/src/plugin_common/vorbiscomment.h @@ -19,12 +19,10 @@ #ifndef FLAC__PLUGIN_COMMON__VORBISCOMMENT_H #define FLAC__PLUGIN_COMMON__VORBISCOMMENT_H -#include "export.h" - #include "canonical_tag.h" #include "FLAC/ordinals.h" -PLUGIN_COMMON_API void FLAC_plugin__vorbiscomment_get(const char *filename, FLAC_Plugin__CanonicalTag *tag); -PLUGIN_COMMON_API FLAC__bool FLAC_plugin__vorbiscomment_set(const char *filename, FLAC_Plugin__CanonicalTag *tag); +void FLAC_plugin__vorbiscomment_get(const char *filename, FLAC_Plugin__CanonicalTag *tag); +FLAC__bool FLAC_plugin__vorbiscomment_set(const char *filename, FLAC_Plugin__CanonicalTag *tag); #endif diff --git a/src/plugin_winamp2/in_flac.dsp b/src/plugin_winamp2/in_flac.dsp index 1e9e44a..ace1acb 100644 --- a/src/plugin_winamp2/in_flac.dsp +++ b/src/plugin_winamp2/in_flac.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.0.4\" /D "in_flac_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.0.4\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\plugin_common.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 msacm32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/bin/in_flac.dll" /libpath:"../../obj/lib" +# ADD LINK32 ..\..\obj\release\lib\plugin_common_static.lib ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC_static.lib kernel32.lib user32.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/release/bin/in_flac.dll" /libpath:"../../obj/release/lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "in_flac - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.0.4\" /D "in_flac_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.0.4\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\plugin_common.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 msacm32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/bin/in_flac.dll" /pdbtype:sept /libpath:"../../obj/lib" +# ADD LINK32 ..\..\obj\debug\lib\plugin_common_static.lib ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/debug/bin/in_flac.dll" /pdbtype:sept /libpath:"../../obj/debug/lib" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/src/plugin_winamp2/in_flac.dsw b/src/plugin_winamp2/in_flac.dsw deleted file mode 100644 index 6a1f3eb..0000000 --- a/src/plugin_winamp2/in_flac.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "in_flac"=.\in_flac.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/share/gain_analysis/Makefile.am b/src/share/gain_analysis/Makefile.am index 06ae052..3100361 100644 --- a/src/share/gain_analysis/Makefile.am +++ b/src/share/gain_analysis/Makefile.am @@ -11,7 +11,7 @@ libgain_analysis_a_SOURCES = gain_analysis.c EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - gain_analysis.dsp + gain_analysis_static.dsp debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/share/gain_analysis/Makefile.vc b/src/share/gain_analysis/Makefile.vc index d3c5e22..5b9e4b3 100644 --- a/src/share/gain_analysis/Makefile.vc +++ b/src/share/gain_analysis/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/share/gain_analysis/gain_analysis.dsp b/src/share/gain_analysis/dynamic.dsp similarity index 93% rename from src/share/gain_analysis/gain_analysis.dsp rename to src/share/gain_analysis/dynamic.dsp index bded8e3..fa6e8f9 100644 --- a/src/share/gain_analysis/gain_analysis.dsp +++ b/src/share/gain_analysis/dynamic.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # 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\share" /D "_DEBUG" /D "_CHATTER" /D "GAIN_ANALYSIS_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "_DEBUG" /D "GAIN_ANALYSIS_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" diff --git a/src/share/gain_analysis/gain_analysis.c b/src/share/gain_analysis/gain_analysis.c index d6a163e..f4a7245 100644 --- a/src/share/gain_analysis/gain_analysis.c +++ b/src/share/gain_analysis/gain_analysis.c @@ -211,7 +211,6 @@ filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* /* returns a INIT_GAIN_ANALYSIS_OK if successful, INIT_GAIN_ANALYSIS_ERROR if not */ -GAIN_ANALYSIS_API int ResetSampleFrequency ( long samplefreq ) { int i; @@ -244,7 +243,6 @@ ResetSampleFrequency ( long samplefreq ) { return INIT_GAIN_ANALYSIS_OK; } -GAIN_ANALYSIS_API int InitGainAnalysis ( long samplefreq ) { @@ -266,7 +264,6 @@ InitGainAnalysis ( long samplefreq ) /* returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not */ -GAIN_ANALYSIS_API int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels ) { @@ -379,7 +376,6 @@ analyzeResult ( Uint32_t* Array, size_t len ) } -GAIN_ANALYSIS_API Float_t GetTitleGain ( void ) { @@ -402,7 +398,6 @@ GetTitleGain ( void ) } -GAIN_ANALYSIS_API Float_t GetAlbumGain ( void ) { diff --git a/src/share/gain_analysis/gain_analysis_static.dsp b/src/share/gain_analysis/gain_analysis_static.dsp new file mode 100644 index 0000000..f5dd151 --- /dev/null +++ b/src/share/gain_analysis/gain_analysis_static.dsp @@ -0,0 +1,108 @@ +# Microsoft Developer Studio Project File - Name="gain_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=gain_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 "gain_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 "gain_analysis_static.mak" CFG="gain_analysis_static - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "gain_analysis_static - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "gain_analysis_static - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "gain_analysis" +# PROP Scc_LocalPath "..\..\.." +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "gain_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 "..\..\..\obj\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 /W3 /GX /O2 /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 /nodefaultlib /nologo /out:"..\..\..\obj\release\lib/gain_analysis_static.lib" + +!ELSEIF "$(CFG)" == "gain_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 "..\..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\..\obj\debug\lib/gain_analysis_static.lib" + +!ENDIF + +# Begin Target + +# Name "gain_analysis_static - Win32 Release" +# Name "gain_analysis_static - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=.\gain_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\gain_analysis.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 1636f91..44d25c4 100644 --- a/src/share/getopt/Makefile.am +++ b/src/share/getopt/Makefile.am @@ -11,7 +11,7 @@ libgetopt_a_SOURCES = getopt.c getopt1.c EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - getopt.dsp + getopt_static.dsp debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/share/getopt/Makefile.vc b/src/share/getopt/Makefile.vc index 0f1a51d..a6f0958 100644 --- a/src/share/getopt/Makefile.vc +++ b/src/share/getopt/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/share/getopt/getopt.dsp b/src/share/getopt/dynamic.dsp similarity index 94% rename from src/share/getopt/getopt.dsp rename to src/share/getopt/dynamic.dsp index f092ab2..7c6c07a 100644 --- a/src/share/getopt/getopt.dsp +++ b/src/share/getopt/dynamic.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # 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 "_CHATTER" /D "GETOPT_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "_DEBUG" /D "GETOPT_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" diff --git a/src/share/getopt/getopt.c b/src/share/getopt/getopt.c index 18c2e84..336cdaa 100644 --- a/src/share/getopt/getopt.c +++ b/src/share/getopt/getopt.c @@ -125,7 +125,7 @@ Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ -GETOPT_API char *share__optarg; +char *share__optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -140,7 +140,7 @@ GETOPT_API char *share__optarg; how much of ARGV has been scanned so far. */ /* 1003.2 says this must be 1 before any call. */ -GETOPT_API int share__optind = 1; +int share__optind = 1; /* Formerly, initialization of getopt depended on share__optind==0, which causes problems with re-calling getopt as programs generally don't @@ -160,13 +160,13 @@ static char *nextchar; /* Callers store zero here to inhibit the error message for unrecognized options. */ -GETOPT_API int share__opterr = 1; +int share__opterr = 1; /* Set to an option character which was unrecognized. This must be initialized on some systems to avoid linking in the system's own getopt implementation. */ -GETOPT_API int share__optopt = '?'; +int share__optopt = '?'; /* Describe how to deal with options that follow non-option ARGV-elements. @@ -522,7 +522,7 @@ share___getopt_initialize (argc, argv, optstring) If LONG_ONLY is nonzero, '-' as well as '--' can introduce long-named options. */ -GETOPT_API int +int share___getopt_internal (argc, argv, optstring, longopts, longind, long_only) int argc; char *const *argv; @@ -978,7 +978,7 @@ share___getopt_internal (argc, argv, optstring, longopts, longind, long_only) } } -GETOPT_API int +int share__getopt (argc, argv, optstring) int argc; char *const *argv; diff --git a/src/share/getopt/getopt1.c b/src/share/getopt/getopt1.c index 38a8779..633d403 100644 --- a/src/share/getopt/getopt1.c +++ b/src/share/getopt/getopt1.c @@ -79,7 +79,7 @@ #define NULL 0 #endif -GETOPT_API int +int share__getopt_long (argc, argv, options, long_options, opt_index) int argc; char *const *argv; @@ -95,7 +95,7 @@ share__getopt_long (argc, argv, options, long_options, opt_index) but does match a short option, it is parsed as a short option instead. */ -GETOPT_API int +int share__getopt_long_only (argc, argv, options, long_options, opt_index) int argc; char *const *argv; diff --git a/src/share/getopt/getopt_static.dsp b/src/share/getopt/getopt_static.dsp new file mode 100644 index 0000000..3b719ad --- /dev/null +++ b/src/share/getopt/getopt_static.dsp @@ -0,0 +1,112 @@ +# 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 "..\..\..\obj\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 /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 /nodefaultlib /nologo /out:"..\..\..\obj\release\lib/getopt_static.lib" + +!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 "..\..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\..\obj\debug\lib/getopt_static.lib" + +!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 a7f86a6..0f2d4a3 100644 --- a/src/share/grabbag/Makefile.am +++ b/src/share/grabbag/Makefile.am @@ -15,7 +15,7 @@ libgrabbag_a_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ Makefile.vc \ - grabbag.dsp + grabbag_static.dsp debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/share/grabbag/Makefile.vc b/src/share/grabbag/Makefile.vc index c80eb9a..e0c4a4a 100644 --- a/src/share/grabbag/Makefile.vc +++ b/src/share/grabbag/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c index 14fe497..561b844 100644 --- a/src/share/grabbag/cuesheet.c +++ b/src/share/grabbag/cuesheet.c @@ -22,12 +22,12 @@ #include #include -GRABBAG_API unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames) +unsigned grabbag__cuesheet_msf_to_frame(unsigned minutes, unsigned seconds, unsigned frames) { return ((minutes * 60) + seconds) * 75 + frames; } -GRABBAG_API void grabbag__cuesheet_frame_to_msf(unsigned frame, unsigned *minutes, unsigned *seconds, unsigned *frames) +void grabbag__cuesheet_frame_to_msf(unsigned frame, unsigned *minutes, unsigned *seconds, unsigned *frames) { *frames = frame % 75; frame /= 75; @@ -454,7 +454,7 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message, #undef FLAC__STRCASECMP } -GRABBAG_API FLAC__StreamMetadata *grabbag__cuesheet_parse(FILE *file, const char **error_message, unsigned *last_line_read, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) +FLAC__StreamMetadata *grabbag__cuesheet_parse(FILE *file, const char **error_message, unsigned *last_line_read, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) { FLAC__StreamMetadata *cuesheet; diff --git a/src/share/grabbag/grabbag.dsp b/src/share/grabbag/dynamic.dsp similarity index 94% rename from src/share/grabbag/grabbag.dsp rename to src/share/grabbag/dynamic.dsp index 2e2f334..dc214d4 100644 --- a/src/share/grabbag/grabbag.dsp +++ b/src/share/grabbag/dynamic.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # 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 "_CHATTER" /D "GRABBAG_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "_DEBUG" /D "GRABBAG_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" diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c index 757d8aa..d8713bc 100644 --- a/src/share/grabbag/file.c +++ b/src/share/grabbag/file.c @@ -39,7 +39,7 @@ #include "share/grabbag.h" -GRABBAG_API void grabbag__file_copy_metadata(const char *srcpath, const char *destpath) +void grabbag__file_copy_metadata(const char *srcpath, const char *destpath) { struct stat srcstat; struct utimbuf srctime; @@ -52,7 +52,7 @@ GRABBAG_API void grabbag__file_copy_metadata(const char *srcpath, const char *de } } -GRABBAG_API off_t grabbag__file_get_filesize(const char *srcpath) +off_t grabbag__file_get_filesize(const char *srcpath) { struct stat srcstat; @@ -62,7 +62,7 @@ GRABBAG_API off_t grabbag__file_get_filesize(const char *srcpath) return -1; } -GRABBAG_API const char *grabbag__file_get_basename(const char *srcpath) +const char *grabbag__file_get_basename(const char *srcpath) { const char *p; @@ -75,7 +75,7 @@ GRABBAG_API const char *grabbag__file_get_basename(const char *srcpath) return ++p; } -GRABBAG_API FLAC__bool grabbag__file_change_stats(const char *filename, FLAC__bool read_only) +FLAC__bool grabbag__file_change_stats(const char *filename, FLAC__bool read_only) { struct stat stats; @@ -104,12 +104,12 @@ GRABBAG_API FLAC__bool grabbag__file_change_stats(const char *filename, FLAC__bo return true; } -GRABBAG_API FLAC__bool grabbag__file_remove_file(const char *filename) +FLAC__bool grabbag__file_remove_file(const char *filename) { return grabbag__file_change_stats(filename, /*read_only=*/false) && 0 == unlink(filename); } -GRABBAG_API FILE *grabbag__file_get_binary_stdin() +FILE *grabbag__file_get_binary_stdin() { /* if something breaks here it is probably due to the presence or * absence of an underscore before the identifiers 'setmode', @@ -125,7 +125,7 @@ GRABBAG_API FILE *grabbag__file_get_binary_stdin() return stdin; } -GRABBAG_API FILE *grabbag__file_get_binary_stdout() +FILE *grabbag__file_get_binary_stdout() { /* if something breaks here it is probably due to the presence or * absence of an underscore before the identifiers 'setmode', diff --git a/src/share/grabbag/grabbag_static.dsp b/src/share/grabbag/grabbag_static.dsp new file mode 100644 index 0000000..64b72c8 --- /dev/null +++ b/src/share/grabbag/grabbag_static.dsp @@ -0,0 +1,136 @@ +# 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 "..\..\..\obj\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 /W3 /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 /nodefaultlib /nologo /out:"..\..\..\obj\release\lib/grabbag_static.lib" + +!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 "..\..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include" /D "FLAC__NO_DLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\..\obj\debug\lib/grabbag_static.lib" + +!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=.\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\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/grabbag/replaygain.c b/src/share/grabbag/replaygain.c index 1ac4ad6..4db87d8 100644 --- a/src/share/grabbag/replaygain.c +++ b/src/share/grabbag/replaygain.c @@ -49,7 +49,7 @@ static const char *gain_format_ = "%s=%+2.2f dB"; static double album_peak_, title_peak_; -GRABBAG_API const unsigned GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED = 148; +const unsigned GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED = 148; /* FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + 21 + 1 + 10 + FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + 21 + 1 + 12 + @@ -96,7 +96,7 @@ static FLAC__bool append_tag_(FLAC__StreamMetadata *block, const char *format, c return FLAC__metadata_object_vorbiscomment_insert_comment(block, block->data.vorbis_comment.num_comments, entry, /*copy=*/true); } -GRABBAG_API FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency) +FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency) { static const unsigned valid_sample_rates[] = { 8000, @@ -119,13 +119,13 @@ GRABBAG_API FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sa return false; } -GRABBAG_API FLAC__bool grabbag__replaygain_init(unsigned sample_frequency) +FLAC__bool grabbag__replaygain_init(unsigned sample_frequency) { title_peak_ = album_peak_ = 0.0; return InitGainAnalysis((long)sample_frequency) == INIT_GAIN_ANALYSIS_OK; } -GRABBAG_API FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples) +FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples) { /* using a small buffer improves data locality; we'd like it to fit easily in the dcache */ static Float_t lbuffer[2048], rbuffer[2048]; @@ -235,14 +235,14 @@ GRABBAG_API FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const inp return true; } -GRABBAG_API void grabbag__replaygain_get_album(float *gain, float *peak) +void grabbag__replaygain_get_album(float *gain, float *peak) { *gain = (float)GetAlbumGain(); *peak = (float)album_peak_; album_peak_ = 0.0; } -GRABBAG_API void grabbag__replaygain_get_title(float *gain, float *peak) +void grabbag__replaygain_get_title(float *gain, float *peak) { *gain = (float)GetTitleGain(); *peak = (float)title_peak_; @@ -318,7 +318,7 @@ static void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecode instance->error = true; } -GRABBAG_API const char *grabbag__replaygain_analyze_file(const char *filename, float *title_gain, float *title_peak) +const char *grabbag__replaygain_analyze_file(const char *filename, float *title_gain, float *title_peak) { DecoderInstance instance; FLAC__FileDecoder *decoder = FLAC__file_decoder_new(); @@ -356,7 +356,7 @@ GRABBAG_API const char *grabbag__replaygain_analyze_file(const char *filename, f return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment(FLAC__StreamMetadata *block, float album_gain, float album_peak, float title_gain, float title_peak) +const char *grabbag__replaygain_store_to_vorbiscomment(FLAC__StreamMetadata *block, float album_gain, float album_peak, float title_gain, float title_peak) { const char *error; @@ -369,7 +369,7 @@ GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment(FLAC__StreamM return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment_album(FLAC__StreamMetadata *block, float album_gain, float album_peak) +const char *grabbag__replaygain_store_to_vorbiscomment_album(FLAC__StreamMetadata *block, float album_gain, float album_peak) { FLAC__ASSERT(0 != block); FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT); @@ -389,7 +389,7 @@ GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment_album(FLAC__S return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_vorbiscomment_title(FLAC__StreamMetadata *block, float title_gain, float title_peak) +const char *grabbag__replaygain_store_to_vorbiscomment_title(FLAC__StreamMetadata *block, float title_gain, float title_peak) { FLAC__ASSERT(0 != block); FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT); @@ -486,7 +486,7 @@ static const char *store_to_file_post_(const char *filename, FLAC__Metadata_Chai return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_file(const char *filename, float album_gain, float album_peak, float title_gain, float title_peak, FLAC__bool preserve_modtime) +const char *grabbag__replaygain_store_to_file(const char *filename, float album_gain, float album_peak, float title_gain, float title_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; FLAC__StreamMetadata *block; @@ -506,7 +506,7 @@ GRABBAG_API const char *grabbag__replaygain_store_to_file(const char *filename, return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_file_album(const char *filename, float album_gain, float album_peak, FLAC__bool preserve_modtime) +const char *grabbag__replaygain_store_to_file_album(const char *filename, float album_gain, float album_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; FLAC__StreamMetadata *block; @@ -526,7 +526,7 @@ GRABBAG_API const char *grabbag__replaygain_store_to_file_album(const char *file return 0; } -GRABBAG_API const char *grabbag__replaygain_store_to_file_title(const char *filename, float title_gain, float title_peak, FLAC__bool preserve_modtime) +const char *grabbag__replaygain_store_to_file_title(const char *filename, float title_gain, float title_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; FLAC__StreamMetadata *block; @@ -571,7 +571,7 @@ static FLAC__bool parse_double_(const FLAC__StreamMetadata_VorbisComment_Entry * return true; } -GRABBAG_API FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadata *block, FLAC__bool album_mode, double *gain, double *peak) +FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadata *block, FLAC__bool album_mode, double *gain, double *peak) { int gain_offset, peak_offset; @@ -591,7 +591,7 @@ GRABBAG_API FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__S return true; } -GRABBAG_API double grabbag__replaygain_compute_scale_factor(double peak, double gain, double preamp, FLAC__bool prevent_clipping) +double grabbag__replaygain_compute_scale_factor(double peak, double gain, double preamp, FLAC__bool prevent_clipping) { double scale; FLAC__ASSERT(peak >= 0.0); diff --git a/src/share/grabbag/seektable.c b/src/share/grabbag/seektable.c index e6aaade..51d23e8 100644 --- a/src/share/grabbag/seektable.c +++ b/src/share/grabbag/seektable.c @@ -21,7 +21,7 @@ #include /* for atoi() */ #include -GRABBAG_API FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec, FLAC__bool only_explicit_placeholders, FLAC__uint64 total_samples_to_encode, unsigned sample_rate, FLAC__StreamMetadata *seektable_template, FLAC__bool *spec_has_real_points) +FLAC__bool grabbag__seektable_convert_specification_to_template(const char *spec, FLAC__bool only_explicit_placeholders, FLAC__uint64 total_samples_to_encode, unsigned sample_rate, FLAC__StreamMetadata *seektable_template, FLAC__bool *spec_has_real_points) { unsigned i; const char *pt; diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am index dbe2287..5304ab4 100644 --- a/src/share/utf8/Makefile.am +++ b/src/share/utf8/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = \ makemap.c \ charset_test.c \ charsetmap.h \ - utf8.dsp + utf8_static.dsp debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/share/utf8/Makefile.vc b/src/share/utf8/Makefile.vc index 2fa8a87..fb9e6ce 100644 --- a/src/share/utf8/Makefile.vc +++ b/src/share/utf8/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include" /I "..\..\..\include\share" -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/share/utf8/utf8.dsp b/src/share/utf8/dynamic.dsp similarity index 93% rename from src/share/utf8/utf8.dsp rename to src/share/utf8/dynamic.dsp index dd2e3eb..bbd5ac1 100644 --- a/src/share/utf8/utf8.dsp +++ b/src/share/utf8/dynamic.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # 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\share" /D "_DEBUG" /D "_CHATTER" /D "UTF8_API_EXPORTS" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "_DEBUG" /D "UTF8_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" diff --git a/src/share/utf8/utf8.c b/src/share/utf8/utf8.c index 7036ef8..174d51f 100644 --- a/src/share/utf8/utf8.c +++ b/src/share/utf8/utf8.c @@ -233,7 +233,7 @@ int iconvert(const char *fromcode, const char *tocode, static char *current_charset = 0; /* means "US-ASCII" */ -UTF8_API void convert_set_charset(const char *charset) +void convert_set_charset(const char *charset) { #ifdef HAVE_LANGINFO_CODESET @@ -296,7 +296,7 @@ static int convert_string(const char *fromcode, const char *tocode, return 3; } -UTF8_API int utf8_encode(const char *from, char **to) +int utf8_encode(const char *from, char **to) { char *charset; @@ -306,7 +306,7 @@ UTF8_API int utf8_encode(const char *from, char **to) return convert_string(charset, "UTF-8", from, to, '#'); } -UTF8_API int utf8_decode(const char *from, char **to) +int utf8_decode(const char *from, char **to) { char *charset; diff --git a/src/share/utf8/utf8_static.dsp b/src/share/utf8/utf8_static.dsp new file mode 100644 index 0000000..509901d --- /dev/null +++ b/src/share/utf8/utf8_static.dsp @@ -0,0 +1,116 @@ +# 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 "..\..\..\obj\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 /W3 /GX /O2 /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 /nodefaultlib /nologo /out:"..\..\..\obj\release\lib/utf8_static.lib" + +!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 "..\..\..\obj\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 /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\..\include\share" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nodefaultlib /nologo /out:"..\..\..\obj\debug\lib/utf8_static.lib" + +!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_libFLAC++/test_libFLAC++.dsp b/src/test_libFLAC++/test_libFLAC++.dsp index 541e652..921ca24 100644 --- a/src/test_libFLAC++/test_libFLAC++.dsp +++ b/src/test_libFLAC++/test_libFLAC++.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "test_libFLAC++ - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/test_libFLAC/test_libFLAC.dsp b/src/test_libFLAC/test_libFLAC.dsp index e88ffd6..d9e45cb 100644 --- a/src/test_libFLAC/test_libFLAC.dsp +++ b/src/test_libFLAC/test_libFLAC.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GX /O2 /I "..\libFLAC\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libFLAC_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "test_libFLAC - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I "..\libFLAC\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libFLAC\include" /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/test_libOggFLAC++/test_libOggFLAC++.dsp b/src/test_libOggFLAC++/test_libOggFLAC++.dsp index d7cca9f..dbe5be2 100644 --- a/src/test_libOggFLAC++/test_libOggFLAC++.dsp +++ b/src/test_libOggFLAC++/test_libOggFLAC++.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC++.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libOggFLAC++_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "test_libOggFLAC++ - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC++.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libOggFLAC++_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC++_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/test_libOggFLAC/test_libOggFLAC.dsp b/src/test_libOggFLAC/test_libOggFLAC.dsp index 2a91137..c3a4ed1 100644 --- a/src/test_libOggFLAC/test_libOggFLAC.dsp +++ b/src/test_libOggFLAC/test_libOggFLAC.dsp @@ -37,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /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" @@ -51,7 +51,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ..\..\obj\release\lib\grabbag_static.lib ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "test_libOggFLAC - Win32 Debug" @@ -62,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\obj\bin" +# PROP Output_Dir "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /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" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # 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 ..\..\obj\lib\grabbag.lib ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libFLAC.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libOggFLAC_static.lib ..\..\obj\debug\lib\libFLAC_static.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/src/test_streams/test_streams.dsp b/src/test_streams/test_streams.dsp new file mode 100644 index 0000000..b9b7a21 --- /dev/null +++ b/src/test_streams/test_streams.dsp @@ -0,0 +1,96 @@ +# 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 "..\..\obj\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 /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 "..\..\obj\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 /W3 /Gm /GX /ZI /Od /I "..\..\include" /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 -- 2.7.4