Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2018-03-11 23:50:39 +0300
committerMikkel Krautz <mikkel@krautz.dk>2018-03-11 23:50:39 +0300
commitadccd8cace340314d7ac87d39ab8b7b642d4cd6f (patch)
tree5f02340fad194dc7ac090933cb61f873e465d772 /installer
parentce8fd36dab2c055dd8b4de62f0be76755754d9a8 (diff)
installer: only use WiX toolset from MUMBLE_PREFIX if the MUMBLE_PREFIX env var is set.
This should allow building the installer with Visual Studio. Thanks to @sregister for the bugreport.
Diffstat (limited to 'installer')
-rw-r--r--installer/MumbleInstall.wixproj2
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/MumbleInstall.wixproj b/installer/MumbleInstall.wixproj
index 1928c7cbe..b25850c9c 100644
--- a/installer/MumbleInstall.wixproj
+++ b/installer/MumbleInstall.wixproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
+ <PropertyGroup Condition=" '$(MUMBLE_PREFIX)' != '' ">
<WixToolPath>$(MUMBLE_PREFIX)\wix\</WixToolPath>
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>