Commit 7fc3dc54 authored by Sergey Radionov's avatar Sergey Radionov Committed by Jean-Baptiste Kempf

ActiveX: added x64 support to VC solution

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 10ed5bf6
......@@ -12,6 +12,9 @@
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
......@@ -95,6 +98,86 @@
Name="VCPostBuildEventTool"
/>
</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)"
......@@ -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>
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment