Commit bfc8e319 authored by Josh Coalson's avatar Josh Coalson
Browse files

revamp MSVC build system, separate dynamic and static builds, separate debug...

revamp MSVC build system, separate dynamic and static builds, separate debug and release intermediate directories
parent 48404ff9
......@@ -9,6 +9,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
......@@ -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>
{{{
......
......@@ -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 \
......
......@@ -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
......
# 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
# 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
......@@ -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 <stddef.h>
#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
}
......
......@@ -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