From c547600599237c0eb65d383f990d12eaa89abfe2 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 31 Jan 2016 09:51:52 +1100 Subject: [PATCH] Remove plugin_common library from MSVC build Previously src/plugin_common library was used by FLAC's own Winamp plugin (MSVC/Windows) and by the XMMS plugin (*nix). The Winamp plugin is long gone from FLAC tree, so plugin_common is unused on Windows. Patch-from: lvqcl --- FLAC-vs2005.sln | 11 - FLAC.sln | 10 - src/plugin_common/Makefile.am | 5 +- src/plugin_common/plugin_common_static.vcproj | 208 ------------------ .../plugin_common_static.vcxproj | 162 -------------- .../plugin_common_static.vcxproj.filters | 47 ---- 6 files changed, 1 insertion(+), 442 deletions(-) delete mode 100644 src/plugin_common/plugin_common_static.vcproj delete mode 100644 src/plugin_common/plugin_common_static.vcxproj delete mode 100644 src/plugin_common/plugin_common_static.vcxproj.filters diff --git a/FLAC-vs2005.sln b/FLAC-vs2005.sln index 44d92c14..a047cb2d 100644 --- a/FLAC-vs2005.sln +++ b/FLAC-vs2005.sln @@ -94,13 +94,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metaflac", "src\metaflac\me {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_common_static", "src\plugin_common\plugin_common_static.vcproj", "{4CEFBC88-C215-11DB-8314-0800200C9A66}" - ProjectSection(ProjectDependencies) = postProject - {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} - {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} - {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_analysis_static", "src\share\replaygain_analysis\replaygain_analysis_static.vcproj", "{4CEFBC89-C215-11DB-8314-0800200C9A66}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_synthesis_static", "src\share\replaygain_synthesis\replaygain_synthesis_static.vcproj", "{4CEFBC8A-C215-11DB-8314-0800200C9A66}" @@ -224,10 +217,6 @@ Global {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/FLAC.sln b/FLAC.sln index e16ac9eb..1c175f80 100644 --- a/FLAC.sln +++ b/FLAC.sln @@ -33,8 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_static", "src\lib EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metaflac", "src\metaflac\metaflac.vcxproj", "{4CEFBC87-C215-11DB-8314-0800200C9A66}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_common_static", "src\plugin_common\plugin_common_static.vcxproj", "{4CEFBC88-C215-11DB-8314-0800200C9A66}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_analysis_static", "src\share\replaygain_analysis\replaygain_analysis_static.vcxproj", "{4CEFBC89-C215-11DB-8314-0800200C9A66}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_synthesis_static", "src\share\replaygain_synthesis\replaygain_synthesis_static.vcxproj", "{4CEFBC8A-C215-11DB-8314-0800200C9A66}" @@ -185,14 +183,6 @@ Global {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 - {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index 571e8c61..f4be766b 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -36,10 +36,7 @@ libplugin_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ - README \ - plugin_common_static.vcproj \ - plugin_common_static.vcxproj \ - plugin_common_static.vcxproj.filters + README debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/src/plugin_common/plugin_common_static.vcproj b/src/plugin_common/plugin_common_static.vcproj deleted file mode 100644 index cf0e9413..00000000 --- a/src/plugin_common/plugin_common_static.vcproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/plugin_common/plugin_common_static.vcxproj b/src/plugin_common/plugin_common_static.vcxproj deleted file mode 100644 index 880dbcca..00000000 --- a/src/plugin_common/plugin_common_static.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4cefbc88-c215-11db-8314-0800200c9a66} - plugin_common_static - Win32Proj - - - - StaticLibrary - true - - - StaticLibrary - true - - - StaticLibrary - - - StaticLibrary - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(SolutionDir)objs\$(Configuration)\lib\ - - - $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ - - - $(SolutionDir)objs\$(Configuration)\lib\ - - - $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ - - - - Disabled - .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase - Default - 4267;4996;%(DisableSpecificWarnings) - - - - - Disabled - .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase - Default - 4267;4996;%(DisableSpecificWarnings) - - - - - true - Speed - true - true - .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) - MultiThreaded - false - Level3 - ProgramDatabase - Default - 4267;4996;%(DisableSpecificWarnings) - - - - - true - Speed - true - true - .\include;..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) - MultiThreaded - false - Level3 - ProgramDatabase - Default - 4267;4996;%(DisableSpecificWarnings) - - - - - - - - - - - - - - - - - - - {4cefbc84-c215-11db-8314-0800200c9a66} - false - - - {4cefbc81-c215-11db-8314-0800200c9a66} - false - - - {4cefbe02-c215-11db-8314-0800200c9a66} - false - - - - - - \ No newline at end of file diff --git a/src/plugin_common/plugin_common_static.vcxproj.filters b/src/plugin_common/plugin_common_static.vcxproj.filters deleted file mode 100644 index fb9a7e03..00000000 --- a/src/plugin_common/plugin_common_static.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file