Add Library_Taglib project

whitequill · Dec 26, 2015 · 84cdecf · 84cdecf
1 parent a744072
commit 84cdecf
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 57 deletions.
diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
@@ -18,7 +18,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>.\;lua/include;lua/lua;.\NowPlaying\SDKs;./taglib;./taglib/toolkit;./taglib/asf;./taglib/mpeg;./taglib/ogg;./taglib/ogg/flac;./taglib/flac;./taglib/mpc;./taglib/ogg/vorbis;./taglib/mpeg/id3v2;./taglib/mpeg/id3v2/frames;./taglib/mpeg/id3v1;./taglib/ape;./taglib/wavpack;./taglib/mp4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TAGLIB_STATIC;_USRDLL;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
@@ -107,33 +107,6 @@
     <ClCompile Include="lua\glue\LuaMeter.cpp" />
     <ClCompile Include="lua\glue\LuaMeterWindow.cpp" />
     <ClCompile Include="lua\glue\LuaGlobal.cpp" />
-    <ClCompile Include="taglib\TagLibUnity.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_ape.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_asf.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_flac.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mp4.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mpeg.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mpeg_id3v2.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_ogg.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_toolkit.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Library.rc" />
@@ -214,6 +187,9 @@
     <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{19312085-aa51-4bd6-be92-4b6098cca539}</Project>
     </ProjectReference>
+    <ProjectReference Include="Library_Taglib.vcxproj">
+      <Project>{0f414430-65c7-4a35-b878-7e6350d6d976}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="Library_Lua.vcxproj">

diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
@@ -234,33 +234,6 @@
     <ClCompile Include="NowPlaying\Player.cpp">
       <Filter>NowPlaying</Filter>
     </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_toolkit.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_ape.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_asf.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_flac.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mp4.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mpeg.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_mpeg_id3v2.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
-    <ClCompile Include="taglib\TagLibUnity_ogg.cpp">
-      <Filter>taglib</Filter>
-    </ClCompile>
     <ClCompile Include="NowPlaying\SDKs\iTunes\iTunesCOMInterface_i.c">
       <Filter>NowPlaying</Filter>
     </ClCompile>

diff --git a/Library/Library_Taglib.vcxproj b/Library/Library_Taglib.vcxproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)Build\VS\Rainmeter.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0F414430-65C7-4A35-B878-7E6350D6D976}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)Build\VS\Rainmeter.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>taglib;taglib/toolkit;taglib/asf;taglib/mpeg;taglib/ogg;taglib/ogg/flac;taglib/flac;taglib/mpc;taglib/ogg/vorbis;taglib/mpeg/id3v2;taglib/mpeg/id3v2/frames;taglib/mpeg/id3v1;taglib/ape;taglib/wavpack;taglib/mp4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;TAGLIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4334;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">true</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="taglib\TagLibUnity.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_ape.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_asf.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_flac.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_mp4.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_mpeg.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_mpeg_id3v2.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_ogg.cpp" />
+    <ClCompile Include="taglib\TagLibUnity_toolkit.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="taglib\tag.h" />
+    <ClInclude Include="taglib\fileref.h" />
+    <ClInclude Include="taglib\audioproperties.h" />
+    <ClInclude Include="taglib\taglib_export.h" />
+    <ClInclude Include="taglib\toolkit\taglib.h" />
+    <ClInclude Include="taglib\toolkit\tpropertymap.h" />
+    <ClInclude Include="taglib\toolkit\tstring.h" />
+    <ClInclude Include="taglib\toolkit\tlist.h" />
+    <ClInclude Include="taglib\toolkit\tstringlist.h" />
+    <ClInclude Include="taglib\toolkit\tbytevector.h" />
+    <ClInclude Include="taglib\toolkit\tbytevectorlist.h" />
+    <ClInclude Include="taglib\toolkit\tbytevectorstream.h" />
+    <ClInclude Include="taglib\toolkit\tiostream.h" />
+    <ClInclude Include="taglib\toolkit\tfile.h" />
+    <ClInclude Include="taglib\toolkit\tfilestream.h" />
+    <ClInclude Include="taglib\toolkit\tmap.h" />
+    <ClInclude Include="taglib\toolkit\trefcounter.h" />
+    <ClInclude Include="taglib\toolkit\tdebuglistener.h" />
+    <ClInclude Include="taglib\mp4\mp4atom.h" />
+    <ClInclude Include="taglib\mp4\mp4coverart.h" />
+    <ClInclude Include="taglib\mp4\mp4file.h" />
+    <ClInclude Include="taglib\mp4\mp4item.h" />
+    <ClInclude Include="taglib\mp4\mp4properties.h" />
+    <ClInclude Include="taglib\mp4\mp4tag.h" />
+    <ClInclude Include="taglib\mpeg\mpegfile.h" />
+    <ClInclude Include="taglib\mpeg\mpegproperties.h" />
+    <ClInclude Include="taglib\mpeg\mpegheader.h" />
+    <ClInclude Include="taglib\mpeg\xingheader.h" />
+    <ClInclude Include="taglib\mpeg\id3v1\id3v1tag.h" />
+    <ClInclude Include="taglib\mpeg\id3v1\id3v1genres.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2extendedheader.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2frame.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2header.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2synchdata.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2footer.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2framefactory.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\id3v2tag.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\attachedpictureframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\commentsframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\generalencapsulatedobjectframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\ownershipframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\popularimeterframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\privateframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\relativevolumeframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\textidentificationframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\uniquefileidentifierframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\unknownframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\unsynchronizedlyricsframe.h" />
+    <ClInclude Include="taglib\mpeg\id3v2\frames\urllinkframe.h" />
+    <ClInclude Include="taglib\ogg\oggfile.h" />
+    <ClInclude Include="taglib\ogg\oggpage.h" />
+    <ClInclude Include="taglib\ogg\oggpageheader.h" />
+    <ClInclude Include="taglib\ogg\xiphcomment.h" />
+    <ClInclude Include="taglib\ogg\vorbis\vorbisfile.h" />
+    <ClInclude Include="taglib\ogg\vorbis\vorbisproperties.h" />
+    <ClInclude Include="taglib\ogg\flac\oggflacfile.h" />
+    <ClInclude Include="taglib\flac\flacfile.h" />
+    <ClInclude Include="taglib\flac\flacpicture.h" />
+    <ClInclude Include="taglib\flac\flacproperties.h" />
+    <ClInclude Include="taglib\flac\flacmetadatablock.h" />
+    <ClInclude Include="taglib\ape\apefile.h" />
+    <ClInclude Include="taglib\ape\apeproperties.h" />
+    <ClInclude Include="taglib\ape\apetag.h" />
+    <ClInclude Include="taglib\ape\apefooter.h" />
+    <ClInclude Include="taglib\ape\apeitem.h" />
+    <ClInclude Include="taglib\mpc\mpcfile.h" />
+    <ClInclude Include="taglib\mpc\mpcproperties.h" />
+    <ClInclude Include="taglib\riff\wav\infotag.h" />
+    <ClInclude Include="taglib\asf\asffile.h" />
+    <ClInclude Include="taglib\asf\asfproperties.h" />
+    <ClInclude Include="taglib\asf\asftag.h" />
+    <ClInclude Include="taglib\asf\asfattribute.h" />
+    <ClInclude Include="taglib\asf\asfpicture.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Library/Library_Zlib.vcxproj b/Library/Library_Zlib.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(SolutionDir)Build\VS\Rainmeter.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0F414430-65C7-4A35-B878-7E6350D6D976}</ProjectGuid>
+    <ProjectGuid>{5D164F45-CEED-47A3-8A5D-B752D09B09DB}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Rainmeter.sln b/Rainmeter.sln
@@ -26,7 +26,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Lua", "Library\Libr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_PCRE", "Library\Library_PCRE.vcxproj", "{6D61FBE9-6913-4885-A95D-1A8C0C223D82}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Zlib", "Library\Library_Zlib.vcxproj", "{0F414430-65C7-4A35-B878-7E6350D6D976}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Taglib", "Library\Library_Taglib.vcxproj", "{0F414430-65C7-4A35-B878-7E6350D6D976}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Zlib", "Library\Library_Zlib.vcxproj", "{5D164F45-CEED-47A3-8A5D-B752D09B09DB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstaller", "SkinInstaller\SkinInstaller.vcxproj", "{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}"
 EndProject
@@ -158,6 +160,14 @@ Global
 		{0F414430-65C7-4A35-B878-7E6350D6D976}.Release|Win32.Build.0 = Release|Win32
 		{0F414430-65C7-4A35-B878-7E6350D6D976}.Release|x64.ActiveCfg = Release|x64
 		{0F414430-65C7-4A35-B878-7E6350D6D976}.Release|x64.Build.0 = Release|x64
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Debug|Win32.Build.0 = Debug|Win32
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Debug|x64.ActiveCfg = Debug|x64
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Debug|x64.Build.0 = Debug|x64
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Release|Win32.ActiveCfg = Release|Win32
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Release|Win32.Build.0 = Release|Win32
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Release|x64.ActiveCfg = Release|x64
+		{5D164F45-CEED-47A3-8A5D-B752D09B09DB}.Release|x64.Build.0 = Release|x64
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.Build.0 = Debug|Win32
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|x64.ActiveCfg = Debug|x64