diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-07-22 07:36:21 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-02 09:43:32 +0000 |
| commit | 22e2da002d8ad18b3d3f1286191f03854939f3c4 (patch) | |
| tree | ca211b7743fa5e018694f11efb717621a9b13f25 /wintun.proj | |
| parent | Use explicit running boolean and use set instead of exchange (diff) | |
| download | wintun-22e2da002d8ad18b3d3f1286191f03854939f3c4.tar.xz wintun-22e2da002d8ad18b3d3f1286191f03854939f3c4.zip | |
Rewrite installer logic in C
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'wintun.proj')
| -rw-r--r-- | wintun.proj | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/wintun.proj b/wintun.proj index 7f787a0..2901616 100644 --- a/wintun.proj +++ b/wintun.proj @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- - SPDX-License-Identifier: MIT + SPDX-License-Identifier: GPL-2.0 Copyright (C) 2019 WireGuard LLC. All Rights Reserved. --> @@ -45,6 +45,22 @@ </Target> <!-- + installer.dll Building + --> + <Target Name="Installer-x86" DependsOnTargets="Driver-x86" + Outputs="x86\Release\installer.dll"> + <MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32"/> + </Target> + <Target Name="Installer-amd64" DependsOnTargets="Driver-amd64" + Outputs="amd64\Release\installer.dll"> + <MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/> + </Target> + <Target Name="Installer-arm64" DependsOnTargets="Driver-arm64" + Outputs="arm64\Release\installer.dll"> + <MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64"/> + </Target> + + <!-- Static Driver Verifier --> <Target Name="SDV" Outputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.xml"> @@ -63,10 +79,12 @@ <!-- MSM Building --> - <Target Name="MSM-x86" Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> - <MSBuild Projects="wintun.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x86"/> + <Target Name="MSM-x86" DependsOnTargets="Installer-x86" + Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> + <MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x86"/> </Target> - <Target Name="MSM-amd64" Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm"> - <MSBuild Projects="wintun.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/> + <Target Name="MSM-amd64" DependsOnTargets="Installer-amd64" + Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm"> + <MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/> </Target> </Project> |