diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-02-05 18:28:10 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-02-05 18:28:10 +0300 |
| commit | e4fe8fb0fd2959b1caf22b84d5ee663ce547a0d7 (patch) | |
| tree | eaeef54b42e1a4eecd7568063061f892495d1e66 /installer | |
| parent | cef2324812294a13f28d4f644bd85b0aef5f37d1 (diff) | |
installer: use WiX from buildenv.
This uses the mechanism documented at
http://wixtoolset.org/documentation/manual/v3/msbuild/daily_builds.html
to use a local copy of WiX instead of using the WiX MSI package.
Previously, we required people to install WiX globally.
That's yet another tedious dependency required in order to build Mumble.
We'll now be distributing WiX in our buildenvs, so tell our .wixproj
to use that version.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/MumbleInstall.wixproj | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/installer/MumbleInstall.wixproj b/installer/MumbleInstall.wixproj index cf497014b..50813436d 100644 --- a/installer/MumbleInstall.wixproj +++ b/installer/MumbleInstall.wixproj @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> + <WixToolPath>$(MUMBLE_PREFIX)\wix\</WixToolPath> + <WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath> + <WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath> + </PropertyGroup> + <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> <ProductVersion>3.5</ProductVersion> |