[vlc-commits] ActiveX: added x64 support to VC solution

[Sergey Radionov]

npapi-vlc | branch: master | Sergey Radionov <RSATom at gmail.com> | Wed Apr  4 15:57:22 2012 +0700| [7fc3dc541cc89d5371adf2f0eed6370849d7c74e] | committer: Jean-Baptiste Kempf

ActiveX: added x64 support to VC solution

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=7fc3dc541cc89d5371adf2f0eed6370849d7c74e
---

 build/vc2008/ActiveX/axvlc.vcproj |  166 +++++++++++++++++++++++++++++++++++++
 build/vc2008/axnp.sln             |    8 ++
 2 files changed, 174 insertions(+)

diff --git a/build/vc2008/ActiveX/axvlc.vcproj b/build/vc2008/ActiveX/axvlc.vcproj
index c9597c5..cc77f90 100644
--- a/build/vc2008/ActiveX/axvlc.vcproj
+++ b/build/vc2008/ActiveX/axvlc.vcproj
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -96,6 +99,86 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName).$(PlatformName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName="$(ProjectName).tlb"
+				OutputDirectory="$(InputDir)"
+				HeaderFileName="$(InputName)_idl.h"
+				InterfaceIdentifierFileName="$(InputName)_idl.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../vc_shared"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AXVLC_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="../../../activex"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib libvlc.lib"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(ProjectDir)..\..\vc_shared\activex\axvlc.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@@ -177,6 +260,89 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName).$(PlatformName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName="$(ProjectName).tlb"
+				OutputDirectory="$(InputDir)"
+				HeaderFileName="$(InputName)_idl.h"
+				InterfaceIdentifierFileName="$(InputName)_idl.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="../../vc_shared"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AXVLC_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="../../../activex"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib libvlc.lib"
+				LinkIncremental="1"
+				ModuleDefinitionFile="$(ProjectDir)..\..\vc_shared\activex\axvlc.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/build/vc2008/axnp.sln b/build/vc2008/axnp.sln
index 9b2ba76..24b38a6 100644
--- a/build/vc2008/axnp.sln
+++ b/build/vc2008/axnp.sln
@@ -8,17 +8,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B77517C1-F54C-4769-858D-7A52C60D833E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B77517C1-F54C-4769-858D-7A52C60D833E}.Debug|Win32.Build.0 = Debug|Win32
+		{B77517C1-F54C-4769-858D-7A52C60D833E}.Debug|x64.ActiveCfg = Debug|x64
+		{B77517C1-F54C-4769-858D-7A52C60D833E}.Debug|x64.Build.0 = Debug|x64
 		{B77517C1-F54C-4769-858D-7A52C60D833E}.Release|Win32.ActiveCfg = Release|Win32
 		{B77517C1-F54C-4769-858D-7A52C60D833E}.Release|Win32.Build.0 = Release|Win32
+		{B77517C1-F54C-4769-858D-7A52C60D833E}.Release|x64.ActiveCfg = Release|x64
+		{B77517C1-F54C-4769-858D-7A52C60D833E}.Release|x64.Build.0 = Release|x64
 		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Debug|Win32.Build.0 = Debug|Win32
+		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Debug|x64.ActiveCfg = Debug|Win32
 		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Release|Win32.ActiveCfg = Release|Win32
 		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Release|Win32.Build.0 = Release|Win32
+		{6166B280-56A7-4951-BFF9-237B7454E2D5}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE