mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2835: installer: don't ship dbghelp.dll anymore.

Browse Source
This commit is contained in:
Mikkel Krautz 2017-02-10 00:14:56 +01:00 committed by GitHub
commit 5bbd804ec3
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
installer/Files.wxs
View File

@ -79,10 +79,6 @@
<?include "MumbleUCRTComponents.wxi" ?>
<?endif ?>
<Component Id="dbghelp.dll">
<File Source="$(var.DebugToolsDir)\dbghelp.dll" KeyPath="yes" />
</Component>
<?ifdef VersionSubDir ?>
</DirectoryRef>
<?else ?>
@ -150,9 +146,6 @@
<?ifdef RedistDirUCRT ?>
<?include "MurmurUCRTComponents.wxi" ?>
<?endif ?>
<Component Id="Murmur_dbghelp.dll">
<File Id="Murmur_dbghelp.dll" Source="$(var.DebugToolsDir)\dbghelp.dll" KeyPath="yes" />
</Component>
<?endif ?>
<Component Id="licence.txt" Guid="$(var.LicenseTextGuid)">

3
installer/Product.wxs
View File

@ -141,8 +141,6 @@
<?include "MumbleUCRTComponentRefs.wxi" ?>
<?endif ?>
<ComponentRef Id="dbghelp.dll" />
<Feature Id="MumbleDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no">
<ComponentRef Id="MumbleDesktopShortcutComponent" />
</Feature>
@ -161,7 +159,6 @@
<?ifdef RedistDirUCRT ?>
<?include "MurmurUCRTComponentRefs.wxi" ?>
<?endif ?>
<ComponentRef Id="Murmur_dbghelp.dll" />
<?endif ?>
<Feature Id="MurmurDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no">

10
installer/Settings.wxi
View File

@ -36,16 +36,6 @@
<?define QtDir = "$(env.MumbleQtDir)" ?>
<?endif ?>
<?ifndef env.MumbleDebugToolsDir ?>
<?if $(sys.BUILDARCH) = "x86" ?>
<?define DebugToolsDir = "C:\Program Files (x86)\Debugging Tools for Windows (x86)" ?>
<?elseif $(sys.BUILDARCH) = "x64" ?>
<?define DebugToolsDir = "C:\Program Files\Debugging Tools for Windows (x64)" ?>
<?endif ?>
<?else ?>
<?define DebugToolsDir = "$(env.MumbleDebugToolsDir)" ?>
<?endif ?>
<?ifndef env.MumbleSndFileDir ?>
<?ifndef env.MumbleNoSndFile ?>
<?define SndFileDir = "\Program Files (x86)\Mega-Nerd\libsndfile\bin" ?>