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

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

3 files changed, 192 insertions, 84 deletions

diff --git a/project/VS2008Express/XBMC for Windows.sln b/project/VS2008Express/XBMC for Windows.sln
index a572d8da70..28954af17e 100644
--- a/project/VS2008Express/XBMC for Windows.sln
+++ b/project/VS2008Express/XBMC for Windows.sln
@@ -125,6 +125,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libStSoundLibrary_dll", "..
 EndProject

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

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAC3Codec_dll", "..\..\xbmc\cores\paplayer\AC3Codec\vc++\AC3Codec.vcproj", "{3039DB92-836E-4563-9DE0-D0C2AB28F14F}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -457,6 +459,14 @@ Global
 		{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

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Debug (DirectX)|Win32.Build.0 = Debug|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Release (DirectX)|Win32.ActiveCfg = Release|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Release (DirectX)|Win32.Build.0 = Release|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32

+		{3039DB92-836E-4563-9DE0-D0C2AB28F14F}.Release (OpenGL)|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcproj b/xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcproj
index 836576e06c..7c3904dee4 100644
--- a/xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcproj
+++ b/xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcproj
@@ -1,124 +1,191 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

-	Name="AC3Codec"

+	Version="9,00"

+	Name="libAC3Codec_dll"

 	ProjectGUID="{3039DB92-836E-4563-9DE0-D0C2AB28F14F}"

-	SccProjectName=""

-	SccLocalPath="">

+	RootNamespace="libAC3Codec_dll"

+	TargetFrameworkVersion="131072"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\Release"

 			IntermediateDirectory=".\Release"

 			ConfigurationType="2"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

 				AdditionalIncludeDirectories=".,../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

+				BufferSecurityCheck="false"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release/liba52.pch"

 				AssemblerListingLocation=".\Release/"

 				ObjectFile=".\Release/"

 				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="true"

+				CompileAs="1"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

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

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				OptimizeForWindows98="1"

+				ProfileGuidedDatabase=""

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary="$(TargetName).lib"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory=".\Debug"

 			IntermediateDirectory=".\Debug"

 			ConfigurationType="2"

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

 			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".,../include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="2"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Debug/liba52.pch"

 				AssemblerListingLocation=".\Debug/"

 				ObjectFile=".\Debug/"

 				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

-				CompileAs="0"/>

+				CompileAs="1"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLinkerTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCLinkerTool"

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

+				ProfileGuidedDatabase=""

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				ImportLibrary="$(TargetName).lib"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<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>

@@ -126,122 +193,153 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

 			<File

-				RelativePath="..\liba52\bit_allocate.c">

+				RelativePath="..\liba52\bit_allocate.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\liba52\bitstream.c">

+				RelativePath="..\liba52\bitstream.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\liba52\downmix.c">

+				RelativePath="..\liba52\downmix.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\liba52\imdct.c">

+				RelativePath="..\liba52\imdct.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\liba52\parse.c">

+				RelativePath="..\liba52\parse.c"

+				>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

 						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

+						PreprocessorDefinitions=""

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

 						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"/>

+						BasicRuntimeChecks="3"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

+			Filter="h;hpp;hxx;hm;inl"

+			>

 			<File

-				RelativePath=".\a52.h">

+				RelativePath=".\a52.h"

+				>

 			</File>

 			<File

-				RelativePath="..\liba52\a52_internal.h">

+				RelativePath="..\liba52\a52_internal.h"

+				>

 			</File>

 			<File

-				RelativePath="..\liba52\bitstream.h">

+				RelativePath="..\liba52\bitstream.h"

+				>

 			</File>

 			<File

-				RelativePath="..\liba52\tables.h">

+				RelativePath="..\liba52\tables.h"

+				>

 			</File>

 		</Filter>

 	</Files>

diff --git a/xbmc/cores/paplayer/AC3Codec/vc++/config.h b/xbmc/cores/paplayer/AC3Codec/vc++/config.h
index d610921218..cc3e7f4a23 100644
--- a/xbmc/cores/paplayer/AC3Codec/vc++/config.h
+++ b/xbmc/cores/paplayer/AC3Codec/vc++/config.h
@@ -145,7 +145,7 @@
 
 /* Define as `__restrict' if that's what the C compiler calls it, or to
    nothing if it is not supported. */
-#define restrict __restrict
+/*#define restrict __restrict */
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */