diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-08-05 13:32:03 +0200 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2019-08-05 17:14:27 +0200 |
| commit | fa715c48638c7316ed6eaf555e664fa39b302d5e (patch) | |
| tree | 12b8a6e06e6b3d4b0b83a5bb6389a4199a71cdb5 /wintun.proj | |
| parent | Dynamically gather signtool full path (diff) | |
| download | wintun-fa715c48638c7316ed6eaf555e664fa39b302d5e.tar.xz wintun-fa715c48638c7316ed6eaf555e664fa39b302d5e.zip | |
Use WiX directly rather than via WiX's MSBuild
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'wintun.proj')
| -rw-r--r-- | wintun.proj | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/wintun.proj b/wintun.proj index 04ff4da..ea24c0d 100644 --- a/wintun.proj +++ b/wintun.proj @@ -48,22 +48,6 @@ </Target> <!-- - installer.dll Building - --> - <Target Name="Installer-x86" - Outputs="x86\Release\installer.dll"> - <MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32" /> - </Target> - <Target Name="Installer-amd64" - Outputs="amd64\Release\installer.dll"> - <MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64" /> - </Target> - <Target Name="Installer-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"> @@ -85,12 +69,16 @@ <!-- MSM Building --> - <Target Name="MSM-x86" DependsOnTargets="Installer-x86" + <Target Name="MSM-x86" Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> - <MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x86" /> + <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=Win32" /> </Target> - <Target Name="MSM-amd64" DependsOnTargets="Installer-amd64" + <Target Name="MSM-amd64" Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm"> - <MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x64" /> + <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=x64" /> + </Target> + <Target Name="MSM-ARM64" + Outputs="$(DistributionDir)wintun-arm64-$(WintunVersionStr).msm"> + <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=ARM64" /> </Target> </Project> |