From 6f6dc5d66946175de559140e073f558ae6c7a04d Mon Sep 17 00:00:00 2001
From: Sean <skasun@gmail.com>
Date: Fri, 22 Mar 2019 23:50:58 -0700
Subject: [PATCH] added dlls to installer

---
 make_installer.bat |  6 +++---
 minutor.wxs        | 23 ++++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/make_installer.bat b/make_installer.bat
index d5ffb8b6..1c5e7de0 100644
--- a/make_installer.bat
+++ b/make_installer.bat
@@ -1,4 +1,4 @@
-"c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" MyWixUI_InstallDir.wxs
-"c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" minutor.wxs
-"c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -ext WixUIExtension -o minutor.msi minutor.wixobj MyWixUI_InstallDir.wixobj
+"c:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" MyWixUI_InstallDir.wxs
+"c:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" minutor.wxs
+"c:\Program Files (x86)\WiX Toolset v3.14\bin\light.exe" -ext WixUIExtension -o minutor.msi minutor.wixobj MyWixUI_InstallDir.wixobj
 @pause
diff --git a/minutor.wxs b/minutor.wxs
index 53b017f7..a819f64c 100644
--- a/minutor.wxs
+++ b/minutor.wxs
@@ -4,7 +4,7 @@
 <?define ProductUpgradeCode="5da343bf-7e4f-4849-acb0-da8c6682a71e"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="Minutor" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Sean Kasun" UpgradeCode="$(var.ProductUpgradeCode)">
-		<Package InstallerVersion="200" Compressed="yes" />
+		<Package InstallerVersion="300" Compressed="yes" />
 		<Media Id="1" Cabinet="minutor.cab" EmbedCab="yes" CompressionLevel="high" />
 
 		<Icon Id="ProductIcon" SourceFile="icon.ico" />
@@ -32,13 +32,20 @@
 		<DirectoryRef Id="INSTALLDIR">
 			<Component Id="minutor.exe" Guid="670f74ff-eb96-4003-828a-2f24e5a42539">
 				<File Id="minutor.exe" Source="minutor.exe" KeyPath="yes" Checksum="yes">
-					<Shortcut Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Advertise="yes" Name="Minutor"
-					WorkingDirectory="INSTALLDIR"  Icon="icon.exe">
-						<Icon Id="icon.exe" SourceFile="icon.ico" />
+					<Shortcut Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Advertise="yes" Name="Minutor" WorkingDirectory="INSTALLDIR"  Icon="icon.ico">
+						<Icon Id="icon.ico" SourceFile="icon.ico" />
 					</Shortcut>
-				</File>
+        </File>
 				<RemoveFolder Id="DeleteShortcutFolder" Directory="ApplicationProgramsFolder" On="uninstall" />
-			</Component>
+      </Component>
+      <Component Id="libeay32.dll" Guid="0f60e6b5-482a-4373-9d19-9e849ad1cc92">
+        <File Id="libeay32.dll" Source="libeay32.dll" KeyPath="yes" Checksum="yes">
+        </File>
+      </Component>
+      <Component Id="ssleay32.dll" Guid="11bb6d60-045d-4315-964c-709742741d72">
+        <File Id="ssleay32.dll" Source="ssleay32.dll" KeyPath="yes" Checksum="yes">
+        </File>
+      </Component>
 		</DirectoryRef>
 
 		<InstallExecuteSequence>
@@ -46,7 +53,9 @@
 		</InstallExecuteSequence>
 
 		<Feature Id="DefaultFeature" Level="1">
-			<ComponentRef Id="minutor.exe" />
+      <ComponentRef Id="minutor.exe" />
+      <ComponentRef Id="libeay32.dll" />
+      <ComponentRef Id="ssleay32.dll" />
 		</Feature>
 
 		<Property Id="WIXUI_INSTALLDIR">INSTALLDIR</Property>