diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-07-03 12:26:06 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-30 16:50:58 +0100 |
| commit | 0ef8578c81d3d348c13f4eb9ec55a4ddccba4879 (patch) | |
| tree | 20e8288e7bacf87a1fe7013130a6ea8cf15d7e31 /installer | |
| parent | msi-example: add ARM64 support (diff) | |
| download | wintun-0ef8578c81d3d348c13f4eb9ec55a4ddccba4879.tar.xz wintun-0ef8578c81d3d348c13f4eb9ec55a4ddccba4879.zip | |
api: add skeleton for wintun.dll
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/installer.vcxproj | 2 | ||||
| -rw-r--r-- | installer/installer.wxs | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index 8f92064..3bbd5fd 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -111,7 +111,7 @@ </PropertyGroup> <PropertyGroup> <OutDir>..\$(WintunPlatform)\$(Configuration)\</OutDir> - <IntDir>..\$(WintunPlatform)\$(Configuration)\installer-intermediate\</IntDir> + <IntDir>..\$(WintunPlatform)\$(Configuration)\$(ProjectName)-intermediate\</IntDir> <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> <RunCodeAnalysis>true</RunCodeAnalysis> <LocalDebuggerCommand>rundll32.exe</LocalDebuggerCommand> diff --git a/installer/installer.wxs b/installer/installer.wxs index fbb7c42..281b397 100644 --- a/installer/installer.wxs +++ b/installer/installer.wxs @@ -4,6 +4,12 @@ Copyright (C) 2018-2019 WireGuard LLC. All Rights Reserved. --> + +<?if $(var.WINTUN_PLATFORM) = "x86"?> + <?define PlatformSystemFolder = "SystemFolder"?> +<?else?> + <?define PlatformSystemFolder = "System64Folder"?> +<?endif?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Module Id="wintun" Language="0" Version="$(var.WINTUN_VERSION)"> <Package @@ -24,6 +30,12 @@ Value="1" KeyPath="yes" /> </Component> + + <Directory Id="$(var.PlatformSystemFolder)"> + <Component Guid="5dd2a342-6a4c-4af6-8ebc-b05411644b1c"> + <File Id="wintun.dll" Name="wintun.dll" Source="!(bindpath.output_dir)wintun.dll" KeyPath="yes" /> + </Component> + </Directory> </Directory> <Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes" /> |