From e7db5242c98824073e8d1e6dbbe33efd318c1df7 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 29 Nov 2020 15:58:20 -0600
Subject: [PATCH] Update installer for new DLLs

---
 mish-setup/Bundle.wxs | 17 +++++++++++++++++
 mish/Product.wxs      |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/mish-setup/Bundle.wxs b/mish-setup/Bundle.wxs
index a937794..0e3eb10 100644
--- a/mish-setup/Bundle.wxs
+++ b/mish-setup/Bundle.wxs
@@ -13,6 +13,23 @@
     <WixVariable Id="WixUILicenseRtf" Value="" />
 
     <Chain>
+      <ExePackage Name="Microsoft Visual C++ 2015-2019 Redistributable"
+                  Cache="no"
+                  PerMachine="yes"
+                  Permanent="yes"
+                  Vital="yes"
+                  InstallCommand="/install /quiet /norestart"
+                  DownloadUrl="https://moonlight-stream.org/downloads/vcredist/14.28.29334/vcredist_x86.exe">
+        
+        <RemotePayload Description="Microsoft Visual C++ 2015-2019 Redistributable"
+                       ProductName="Microsoft Visual C++ 2015-2019 Redistributable"
+                       Size="14328440"
+                       Version="14.28.29334.0"
+                       Hash="17674FCC6CF3A2FFDC391BDCDE082AA936E37A89"/>
+
+        <!-- Newer version installed is fine -->
+        <ExitCode Value="1638" Behavior="success" />
+      </ExePackage>
       <MsiPackage Id="mish" SourceFile="$(var.mish.TargetPath)" />
       <MsiPackage SourceFile="$(var.GSv6FwdSetup.TargetPath)" />
 		</Chain>
diff --git a/mish/Product.wxs b/mish/Product.wxs
index 89dc691..f8e87cc 100644
--- a/mish/Product.wxs
+++ b/mish/Product.wxs
@@ -52,6 +52,12 @@
 
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component Id="MiniupnpcDll">
+        <File Source="$(var.miss.TargetDir)\miniupnpc.dll" KeyPath="yes"/>
+      </Component>
+      <Component Id="LibnatpmpDll">
+        <File Source="$(var.miss.TargetDir)\libnatpmp.dll" KeyPath="yes"/>
+      </Component>
       <Component Id="MISS">
         <File Source="$(var.miss.TargetPath)" KeyPath="yes">
           <fire:FirewallException Id="MISSFwException"