From 61259445c04b9703fb329c540c301cbb3b3615fb Mon Sep 17 00:00:00 2001
From: Ferdinand Schober <ferdinandschober20@gmail.com>
Date: Mon, 17 Mar 2025 19:25:58 +0100
Subject: [PATCH] fix icons

---
 wix/Folders.wxs            |  5 ++++-
 wix/LanMouse.wixproj       | 29 +++++++++++++++++++++++++++++
 wix/LanMouseComponents.wxs | 14 ++++++++++----
 wix/package.wxs            |  3 +++
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/wix/Folders.wxs b/wix/Folders.wxs
index c1cf829..4e866d8 100644
--- a/wix/Folders.wxs
+++ b/wix/Folders.wxs
@@ -1,7 +1,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 	<Fragment>
 		<StandardDirectory Id="ProgramFiles64Folder">
-			<Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)" />
+			<Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)">
+				<Directory Id="SHARE" Name="share"/>
+				<Directory Id="LIB" Name="lib"/>
+			</Directory>
 		</StandardDirectory>
 		<StandardDirectory Id="ProgramMenuFolder">
 			<Directory Id="ApplicationProgramsFolder" Name="!(bind.Property.ProductName)"/>
diff --git a/wix/LanMouse.wixproj b/wix/LanMouse.wixproj
index fbf44b0..34bb34f 100644
--- a/wix/LanMouse.wixproj
+++ b/wix/LanMouse.wixproj
@@ -2,4 +2,33 @@
 	<PropertyGroup>
 		<InstallerPlatform>x64</InstallerPlatform>
 	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="WixToolset.Heat">
+		  <Version>5.0.2</Version>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\bin">
+			<ComponentGroupName>GTKBIN</ComponentGroupName>
+			<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
+			<SuppressRegistry>true</SuppressRegistry>
+		</HarvestDirectory>
+		<BindPath Include="C:\gtk-build\gtk\x64\release\bin" />
+	</ItemGroup>
+	<ItemGroup>
+		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\share\icons">
+			<ComponentGroupName>GTKICONS</ComponentGroupName>
+			<DirectoryRefId>SHARE</DirectoryRefId>
+			<SuppressRegistry>true</SuppressRegistry>
+		</HarvestDirectory>
+		<BindPath Include="C:\gtk-build\gtk\x64\release\share\icons" />
+	</ItemGroup>
+	<ItemGroup>
+		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0">
+			<ComponentGroupName>GTKLIBS</ComponentGroupName>
+			<DirectoryRefId>LIB</DirectoryRefId>
+			<SuppressRegistry>true</SuppressRegistry>
+		</HarvestDirectory>
+		<BindPath Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0" />
+	</ItemGroup>
 </Project>
diff --git a/wix/LanMouseComponents.wxs b/wix/LanMouseComponents.wxs
index c6d8800..1fe2323 100644
--- a/wix/LanMouseComponents.wxs
+++ b/wix/LanMouseComponents.wxs
@@ -1,16 +1,22 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 	<Fragment>
-		<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER">
-			<Component>
+		<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER" Subdirectory="bin">
+			<Component Guid="{ECB52D3E-28AD-4BEC-B9DF-E01CCAB356BE}">
+				<!-- the main binary -->
 				<File Source="..\target\release\lan-mouse.exe"/>
+
+				<!-- visual c runtime dll -->
+				<File Source="C:\windows\system32\VCRUNTIME140.dll"/>
+				<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>
 			</Component>
+			<!-- start menu entry-->
 			<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">
 				<Shortcut Id="ApplicationStartMenuShortcut"
 						  Name="!(bind.Property.ProductName)"
 						  Description ="Mouse and Keyboard sharing Software"
-						  Target="[INSTALLFOLDER]lan-mouse.exe"
+						  Target="[INSTALLFOLDER]bin\lan-mouse.exe"
 						  WorkingDirectory="INSTALLFOLDER">
-				<Icon Id="LanMouse" SourceFile=".\icon.ico"/>
+					<Icon Id="LanMouse" SourceFile=".\icon.ico"/>
 				</Shortcut>
 				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
 				<RegistryValue
diff --git a/wix/package.wxs b/wix/package.wxs
index 4bbfd55..9b16a25 100644
--- a/wix/package.wxs
+++ b/wix/package.wxs
@@ -8,6 +8,9 @@
 
     <MediaTemplate EmbedCab="yes"/>
     <Feature Id="Main">
+	  <ComponentGroupRef Id="GTKBIN"/>
+      <ComponentGroupRef Id="GTKICONS"/>
+	  <ComponentGroupRef Id="GTKLIBS"/>
       <ComponentGroupRef Id="LanMouseComponents"/>
     </Feature>
   </Package>