[WIN32] [VS2010] build libdts within the XBMC main project

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29414 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 244 insertions, 3 deletions

diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln
index 301086155c..1f4cc798b9 100644
--- a/project/VS2010Express/XBMC for Windows.sln
+++ b/project/VS2010Express/XBMC for Windows.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

+# Visual Studio 2010

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcxproj", "{3A68081D-E8F9-4523-9436-530DE9E5530A}"

 	ProjectSection(ProjectDependencies) = postProject

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}

@@ -89,6 +89,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libStSoundLibrary_dll", "..
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\lib\freetype\builds\win32\vs2010\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdts_dll", "..\..\xbmc\cores\dvdplayer\Codecs\libdts\vc++\libdts.vcxproj", "{F93133AB-EB51-4955-AEDF-639632891042}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug (DirectX)|Win32 = Debug (DirectX)|Win32

@@ -571,6 +573,18 @@ Global
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release (OpenGL)|Win32.Build.0 = Release Multithreaded|Win32

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug (DirectX)|Win32.Build.0 = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Debug|Win32.Build.0 = Debug|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release (DirectX)|Win32.ActiveCfg = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release (DirectX)|Win32.Build.0 = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release (OpenGL)|Win32.Build.0 = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release|Win32.ActiveCfg = Release|Win32

+		{F93133AB-EB51-4955-AEDF-639632891042}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj b/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj
new file mode 100644
index 0000000000..84874461b3
--- /dev/null
+++ b/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>libdts_dll</ProjectName>

+    <ProjectGuid>{F93133AB-EB51-4955-AEDF-639632891042}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\vs2010\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\vs2010\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libdts</TargetName>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.;../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>.\Debug/libdts.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <CompileAs>CompileAsC</CompileAs>

+      <DisableSpecificWarnings>4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

+      <ModuleDefinitionFile>libdts.def</ModuleDefinitionFile>

+      <ProfileGuidedDatabase>

+      </ProfileGuidedDatabase>

+      <ImportLibrary>$(Configuration)\vs2010\$(TargetName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>copy "$(TargetPath)" "..\..\..\..\..\..\system\players\dvdplayer\$(TargetFileName)"</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>.;../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>.\Release/libdts.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>CompileAsC</CompileAs>

+      <DisableSpecificWarnings>4244;4305;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

+      <ModuleDefinitionFile>libdts.def</ModuleDefinitionFile>

+      <ProfileGuidedDatabase>

+      </ProfileGuidedDatabase>

+      <ImportLibrary>$Configuration)\$(TargetName).lib</ImportLibrary>

+    </Link>

+    <PostBuildEvent>

+      <Command>copy "$(TargetPath)" "..\..\..\..\..\..\system\players\dvdplayer\$(TargetFileName)"</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\libdts\bitstream.c">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="..\libdts\downmix.c">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="..\libdts\parse.c">

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>

+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\libdts\bitstream.h" />

+    <ClInclude Include="..\include\dts.h" />

+    <ClInclude Include="..\libdts\dts_internal.h" />

+    <ClInclude Include="..\libdts\tables.h" />

+    <ClInclude Include="..\libdts\tables_adpcm.h" />

+    <ClInclude Include="..\libdts\tables_fir.h" />

+    <ClInclude Include="..\libdts\tables_huffman.h" />

+    <ClInclude Include="..\libdts\tables_quantization.h" />

+    <ClInclude Include="..\libdts\tables_vq.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="libdts.def" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj.filters b/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj.filters
new file mode 100644
index 0000000000..a61b83b8d1
--- /dev/null
+++ b/xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj.filters
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{c224872d-b582-40f7-807f-10b89a5e7b60}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{626a3013-c1e6-4ed8-9227-4f18345b72c1}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\libdts\bitstream.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libdts\downmix.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\libdts\parse.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\libdts\bitstream.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\include\dts.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\dts_internal.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables_adpcm.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables_fir.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables_huffman.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables_quantization.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\libdts\tables_vq.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="libdts.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj b/xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj
index 2d85320091..f35027bffc 100644
--- a/xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj
+++ b/xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj
@@ -60,7 +60,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Lib>

-      <OutputFile>../../lib/squishd.lib</OutputFile>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>

     </Lib>

   </ItemDefinitionGroup>

@@ -79,7 +79,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Lib>

-      <OutputFile>../../lib/squish.lib</OutputFile>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>

     </Lib>

   </ItemDefinitionGroup>