Skip to content
Permalink
Browse files

installer: drop InstallerVersion back to 300. add note about Installe…

…rVersion requirements for VC12 redist to MergeModuleDir setting.

This change effectively reverts commit 0e44742.
  • Loading branch information...
mkrautz committed Apr 5, 2014
1 parent 8aafb6c commit c897c5640e6b5d32168218de8ceaf3506f8f4f90
Showing with 5 additions and 1 deletion.
  1. +1 −1 installer/Product.wxs
  2. +4 −0 installer/Settings.wxi
@@ -3,7 +3,7 @@
<?include "Settings.wxi" ?>

<Product Id="*" Name="$(var.ProductName) $(var.ProductVersion)" Language="!(loc.LANG)" Version="$(var.ProductVersion)" Manufacturer="$(var.ProductManufacturer)" UpgradeCode="B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D">
<Package Id="*" InstallerVersion="405" Compressed="yes" Languages="0,1028,1029,1030,1031,1033,1034,1036,1040,1041,1043,1044,1045,1046,1049,1053,1055,2052" />
<Package Id="*" InstallerVersion="300" Compressed="yes" Languages="0,1028,1029,1030,1031,1033,1034,1036,1040,1041,1043,1044,1045,1046,1049,1053,1055,2052" />

<Property Id='NSISINSTALL'>
<RegistrySearch Id='NSISSearch' Win64='no' Root='HKLM' Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Mumble' Type='directory' Name='InstallLocation' />
@@ -64,6 +64,10 @@
<?define ZlibDir = "$(env.MumbleZlibDir)" ?>
<?endif ?>

<!--
Note: in order to use merge modules with MSVS 2013 (VCRedist 12.0),
you need to bump the InstallerVersion in Product.wxs to 405.
-->
<?ifndef env.MumbleMergeModuleDir ?>
<?ifndef env.MumbleNoMergeModule ?>
<?define MergeModuleDir = "C:\Program Files (x86)\Common Files\Merge Modules" ?>

0 comments on commit c897c56

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