aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/installer
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-06-01 18:37:13 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-07 11:31:53 +0200
commita8bf31f81fb4a680766d8ee021cef9d500b0336d (patch)
tree29a7a5c4261aadd9dcb38f3a48dc1eb371f03c36 /installer
parentversion: bump (diff)
downloadwireguard-windows-a8bf31f81fb4a680766d8ee021cef9d500b0336d.tar.xz
wireguard-windows-a8bf31f81fb4a680766d8ee021cef9d500b0336d.zip
build: support building wg(8)
Diffstat (limited to 'installer')
-rw-r--r--installer/build.bat1
-rw-r--r--installer/wireguard.wxs12
2 files changed, 13 insertions, 0 deletions
diff --git a/installer/build.bat b/installer/build.bat
index f8df607c..ef6b2a6d 100644
--- a/installer/build.bat
+++ b/installer/build.bat
@@ -12,6 +12,7 @@ set WIX_LIGHT_FLAGS=-nologo -spdb
set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sw1056
set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE30
set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE61
+set WIX_LIGHT_FLAGS=%WIX_LIGHT_FLAGS% -sice:ICE09
if exist .deps\prepared goto :build
:installdeps
diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 93c97d0c..5680567b 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -75,6 +75,10 @@
<Directory Id="INSTALLFOLDER" Name="WireGuard"/>
</Directory>
<Directory Id="ProgramMenuFolder"/>
+ <Directory Id="SystemFolder"/>
+ <?if $(var.Platform) != "x86"?>
+ <Directory Id="System64Folder"/>
+ <?endif?>
</Directory>
<!--
@@ -87,6 +91,14 @@
</File>
<ServiceControl Id="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" Name="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13"/><!-- A dummy to make WiX create ServiceControl table for us. -->
</Component>
+ <Component Directory="SystemFolder" Win64="no" Id="Wg32Executable" Guid="5ca31841-97d8-4614-a318-f1e268135ba7">
+ <File Source="..\x86\wg.exe" Id="Wg32Executable"/>
+ </Component>
+ <?if $(var.Platform) != "x86"?>
+ <Component Directory="System64Folder" Win64="yes" Id="Wg64Executable" Guid="d9b494ec-0959-442c-89ad-6aa175acfd03">
+ <File Source="..\$(var.Platform)\wg.exe" Id="Wg64Executable"/>
+ </Component>
+ <?endif?>
</ComponentGroup>
<!--