From 0ef8578c81d3d348c13f4eb9ec55a4ddccba4879 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 3 Jul 2020 12:26:06 +0200
Subject: api: add skeleton for wintun.dll

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 installer/installer.vcxproj |  2 +-
 installer/installer.wxs     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'installer')

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" />
-- 
cgit v1.2.3-59-g8ed1b