[WIN32] build adpcm.dll within the XBMC main project.

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

2 files changed, 144 insertions, 74 deletions

diff --git a/project/VS2008Express/XBMC for Windows.sln b/project/VS2008Express/XBMC for Windows.sln
index 8358ed4f76..622e61ceec 100644
--- a/project/VS2008Express/XBMC for Windows.sln
+++ b/project/VS2008Express/XBMC for Windows.sln
@@ -146,6 +146,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libid3tag_dll", "..\..\xbmc
 		{96798038-06CE-4382-BD5B-F9C366724DEB} = {96798038-06CE-4382-BD5B-F9C366724DEB}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libadpcm_dll", "..\..\xbmc\cores\paplayer\ADPCMCodec\adpcm.vcproj", "{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -534,6 +536,14 @@ Global
 		{AEABB6CE-8F0F-4507-8DC4-5E3BCE5962DA}.Release (DirectX)|Win32.Build.0 = Release|Win32

 		{AEABB6CE-8F0F-4507-8DC4-5E3BCE5962DA}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32

 		{AEABB6CE-8F0F-4507-8DC4-5E3BCE5962DA}.Release (OpenGL)|Win32.Build.0 = Release|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Debug (DirectX)|Win32.Build.0 = Debug|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Release (DirectX)|Win32.ActiveCfg = Release|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Release (DirectX)|Win32.Build.0 = Release|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32

+		{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}.Release (OpenGL)|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/xbmc/cores/paplayer/ADPCMCodec/adpcm.vcproj b/xbmc/cores/paplayer/ADPCMCodec/adpcm.vcproj
index 158b3d77f4..32ae315a8a 100644
--- a/xbmc/cores/paplayer/ADPCMCodec/adpcm.vcproj
+++ b/xbmc/cores/paplayer/ADPCMCodec/adpcm.vcproj
@@ -1,110 +1,181 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

-	Name="adpcm"

+	Version="9,00"

+	Name="libadpcm_dll"

 	ProjectGUID="{2A8CBFB5-C226-4BB3-8C03-7C75D511A4A2}"

-	Keyword="Win32Proj">

+	RootNamespace="libadpcm_dll"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="2"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

-				MinimalRebuild="TRUE"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4244;4267;4311;4312"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/adpcm.dll"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/adpcm.pdb"

-				SubSystem="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+				ResourceOutputFileName=""

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCLinkerTool"

+				OutputFile="..\..\..\..\system\players\paplayer\adpcm.dll"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="adpcm.pdb"

+				SubSystem="2"

+				ProfileGuidedDatabase=""

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary="$(TargetName).lib"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName=""/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="2"

-			CharacterSet="2">

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4244;4267;4311;4312"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				ResourceOutputFileName=""

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/adpcm.dll"

+				OutputFile="..\..\..\..\system\players\paplayer\adpcm.dll"

 				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(TargetName).pdb"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

+				ProfileGuidedDatabase=""

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary="$(TargetName).lib"

+				TargetMachine="1"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				ResourceOutputFileName=""/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -113,42 +184,31 @@
 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath=".\ADPCMDll.cpp">

+				RelativePath=".\ADPCMDll.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\mywav.h">

+				RelativePath=".\uXboxAdpcmDecoder.c"

+				>

 			</File>

 			<File

-				RelativePath=".\uXboxAdpcmDecoder.c">

-			</File>

-			<File

-				RelativePath=".\uXboxAdpcmDecoder.h">

+				RelativePath=".\uXboxAdpcmDecoder.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-			<File

-				RelativePath=".\adpcm.ico">

-			</File>

-			<File

-				RelativePath=".\adpcm.rc">

-			</File>

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 			<File

-				RelativePath=".\small.ico">

+				RelativePath=".\mywav.h"

+				>

 			</File>

 		</Filter>

-		<File

-			RelativePath=".\ReadMe.txt">

-		</File>

 	</Files>

 	<Globals>

 	</Globals>