From 03f356c49215a8366e0aa9b472e7c751d640374f Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 5 Aug 2019 11:25:32 +0000
Subject: Dynamically gather signtool full path

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 installer/installer.vcxproj | 2 +-
 installer/installer.wixproj | 2 +-
 wintun.props                | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj
index 306f05f..29a5cf1 100644
--- a/installer/installer.vcxproj
+++ b/installer/installer.vcxproj
@@ -185,7 +185,7 @@
     <CleanDependsOn>CleanSignTarget;$(CleanDependsOn)</CleanDependsOn>
   </PropertyGroup>
   <Target Name="SignTarget" Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign">
-    <Exec Command="signtool.exe sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
   <Target Name="CleanSignTarget">
diff --git a/installer/installer.wixproj b/installer/installer.wixproj
index 90c7964..fd1d8c3 100644
--- a/installer/installer.wixproj
+++ b/installer/installer.wixproj
@@ -67,7 +67,7 @@
     Name="SignTarget"
     Inputs="$(TargetPath)"
     Outputs="$(IntermediateOutputPath)$(TargetName).sign">
-    <Exec Command="signtool.exe sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
   <Target Name="CleanSignTarget">
diff --git a/wintun.props b/wintun.props
index 2744bae..b09cde7 100644
--- a/wintun.props
+++ b/wintun.props
@@ -41,4 +41,9 @@
       <Optimization>Disabled</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
+  <PropertyGroup>
+    <WindowsSdkToolchainPlatform>$(PROCESSOR_ARCHITECTURE)</WindowsSdkToolchainPlatform>
+    <WindowsSdkToolchainPlatform Condition="'$(PROCESSOR_ARCHITECTURE)'=='AMD64'">x64</WindowsSdkToolchainPlatform>
+    <SignToolPath>$(WindowsSdkDir)bin\$(TargetPlatformVersion)\$(WindowsSdkToolchainPlatform)\signtool.exe</SignToolPath>
+  </PropertyGroup>
 </Project>
-- 
cgit v1.2.3-59-g8ed1b