Skip to content
Permalink
Browse files

installer: add the ability to use a custom bzip2 directory in the Win…

…32 installer.

Previously, the bzip2.dll was always taken from the Ice directory.
This is because we previously used ZeroC's binary Ice releases, which
included a bzip2.dll that we could use.
  • Loading branch information...
mkrautz committed Jul 2, 2014
1 parent 9ecdc0f commit 77314f4064484350683b24699e72e92d4aee7f13
Showing with 9 additions and 1 deletion.
  1. +1 −1 installer/Files.wxs
  2. +8 −0 installer/Settings.wxi
@@ -187,7 +187,7 @@
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Component Id="bzip2.dll">
<File Source="$(var.IceDir)\bzip2.dll" KeyPath="yes" />
<File Source="$(var.Bzip2Dir)\bzip2.dll" KeyPath="yes" />
</Component>
<Component Id="ice34.dll">
<File Source="$(var.IceDir)\ice34.dll" KeyPath="yes" />
@@ -52,6 +52,14 @@
<?define IceDir = "$(env.MumbleIceDir)" ?>
<?endif ?>

<?ifndef env.MumbleBzip2Dir ?>
<?ifdef IceDir ?>
<?define Bzip2Dir = "$(var.IceDir)" ?>
<?endif ?>
<?else ?>
<?define Bzip2Dir = "$(env.MumbleBzip2Dir)" ?>
<?endif ?>

<?ifndef env.MumbleOpenSslDir ?>
<?define OpenSslDir = "\dev\openssl" ?>
<?else ?>

0 comments on commit 77314f4

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