diff options
Diffstat (limited to 'installer')
-rw-r--r-- | installer/installer.vcxproj | 2 | ||||
-rw-r--r-- | installer/installer.wxs | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index 3bbd5fd..582a1b1 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -122,6 +122,8 @@ <WixArch Condition="'$(Platform)'=='ARM64'">arm64</WixArch> <WixCandleFlags>$(WixCandleFlags) -nologo -arch $(WixArch) -dWINTUN_PLATFORM=$(WintunPlatform) -dWINTUN_VERSION=$(WintunVersion) -dINSTALLER_VERSION_MIN=$(InstallerVersionMin) -sw1086</WixCandleFlags> <WixLightFlags>$(WixLightFlags) -nologo -b output_dir="$(OutDir.TrimEnd('\'))" -spdb -sw1076 -sw1079</WixLightFlags> + <WixLightFlags Condition="'$(Platform)'=='x64'">$(WixLightFlags) -b output_dir_wow64="..\x86\$(Configuration)"</WixLightFlags> + <WixLightFlags Condition="'$(Platform)'=='ARM64'">$(WixLightFlags) -b output_dir_wow64="..\arm\$(Configuration)"</WixLightFlags> <WixOutputPath>$(OutDir)</WixOutputPath> <WixOutputName>wintun</WixOutputName> <WixOutputExt>.msm</WixOutputExt> diff --git a/installer/installer.wxs b/installer/installer.wxs index 281b397..b9f5c1a 100644 --- a/installer/installer.wxs +++ b/installer/installer.wxs @@ -5,11 +5,6 @@ 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 @@ -31,11 +26,24 @@ KeyPath="yes" /> </Component> - <Directory Id="$(var.PlatformSystemFolder)"> + <?if $(var.WINTUN_PLATFORM) = "x86"?> + <Directory Id="SystemFolder"> <Component Guid="5dd2a342-6a4c-4af6-8ebc-b05411644b1c"> <File Id="wintun.dll" Name="wintun.dll" Source="!(bindpath.output_dir)wintun.dll" KeyPath="yes" /> </Component> </Directory> + <?else?> + <Directory Id="SystemFolder"> + <Component Guid="493548d6-12f6-4286-8fff-4efa77317a8f"> + <File Id="wintun.dll-wow64" Name="wintun.dll" Source="!(bindpath.output_dir_wow64)wintun.dll" KeyPath="yes" /> + </Component> + </Directory> + <Directory Id="System64Folder"> + <Component Guid="5dd2a342-6a4c-4af6-8ebc-b05411644b1c"> + <File Id="wintun.dll" Name="wintun.dll" Source="!(bindpath.output_dir)wintun.dll" KeyPath="yes" /> + </Component> + </Directory> + <?endif?> </Directory> <Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes" /> |