Skip to content
Permalink
Browse files

installer: add x64 platform to the installer.

  • Loading branch information...
mkrautz committed Jul 16, 2014
1 parent 2e5c8a5 commit 9482cc872bace502ed87e90dc1c004f0db54d794
Showing with 43 additions and 23 deletions.
  1. +24 −20 installer/MumbleInstall.sln
  2. +19 −3 installer/MumbleInstall.wixproj
@@ -1,20 +1,24 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MumbleInstall", "MumbleInstall.wixproj", "{84AFEA8B-15E5-4CC7-B77D-27DD17030944}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.ActiveCfg = Debug|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.Build.0 = Debug|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.ActiveCfg = Release|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MumbleInstall", "MumbleInstall.wixproj", "{84AFEA8B-15E5-4CC7-B77D-27DD17030944}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x64.ActiveCfg = Debug|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.ActiveCfg = Debug|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.Build.0 = Debug|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x64.ActiveCfg = Release|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.ActiveCfg = Release|x86
{84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,8 +8,8 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Mumble</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix2010.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix2010.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
@@ -29,6 +29,22 @@
<VerboseOutput>True</VerboseOutput>
<SuppressValidation>True</SuppressValidation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DefineConstants>Debug</DefineConstants>
<LinkerAdditionalOptions />
<Cultures>en-us</Cultures>
<SuppressIces>ICE43;ICE57</SuppressIces>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<DefineConstants />
<LinkerAdditionalOptions>-cc obj -reusecab</LinkerAdditionalOptions>
<VerboseOutput>True</VerboseOutput>
<SuppressValidation>True</SuppressValidation>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Files.wxs" />
<Compile Include="Plugins.wxs" />

0 comments on commit 9482cc8

Please sign in to comment.
You can’t perform that action at this time.