Build instructions added in source

JPersson77 · Mar 24, 2023 · 6032b77 · 6032b77
1 parent fa931e3
commit 6032b77
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/Common/Common.h b/Common/Common.h
@@ -11,7 +11,7 @@
 
 // common general application definitions
 #define			APPNAME							L"LGTV Companion"
-#define         APP_VERSION                     L"2.1.5"
+#define         APP_VERSION                     L"2.1.6"
 #define			CONFIG_FILE						L"config.json"
 #define			LOG_FILE						L"Log.txt"
 #define			WINDOW_CLASS_UNIQUE				L"YOLOx0x0x0181818"

diff --git a/LGTV Companion Service/LGTV Companion Service.vcxproj b/LGTV Companion Service/LGTV Companion Service.vcxproj
@@ -86,7 +86,7 @@
     <TargetName>LGTVsvc</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/LGTV Companion Setup/Product.wxs b/LGTV Companion Setup/Product.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?define LGTV Companion Service_TargetDir=$(var.LGTV Companion Service.TargetDir)?><?define LGTV Companion UI_TargetDir=$(var.LGTV Companion UI.TargetDir)?>
-	<Product Id="E611A82C-7FE8-4C3F-8C40-016ABA16C760" Name="LGTV Companion" Language="1033" Version="2.1.5" Manufacturer="J Persson" UpgradeCode="0BA17E5B-11CE-491D-B1A1-05DD2D9F610A">
+	<Product Id="AE289638-0D1D-4DF5-A26E-56C335265C48" Name="LGTV Companion" Language="1033" Version="2.1.6" Manufacturer="J Persson" UpgradeCode="0BA17E5B-11CE-491D-B1A1-05DD2D9F610A">
 		<Package Id="*" InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform='x64' Description="LGTV Companion installer" InstallPrivileges="elevated" AdminImage="yes"/>
     <Media Id="1" Cabinet="LGTVapp.cab" EmbedCab="yes" />
 

diff --git a/LGTV Companion UI/LGTV Companion UI.cpp b/LGTV Companion UI/LGTV Companion UI.cpp
@@ -16,11 +16,19 @@ BACKGROUND
 	prevent "burn-in", or more accurately pixel-wear.
 
 BUILD INSTRUCTIONS AND DEPENDENCIES
-	Ensure that Vcpkg (https://github.com/microsoft/vcpkg) is installed. Vcpkg is a free ++ Library Manager 
-	for Windows. A Vcpkg manifest is included with the source code and the necessary dependencies
-	will be automatically downloaded, configured and installed. 
+	First, to be able to build the projects (UI, Service, Daemon) in Visual Studio 2022 please 
+	ensure that Vcpkg (https://github.com/microsoft/vcpkg) is installed. Vcpkg is a free 
+	Library Manager for Windows. You should use Vcpkg in one of two ways:
 	
-	If you want to manually install dependencies, use these commands:
+	1) A Vcpkg manifest is included with the source code and the necessary dependencies
+	will be automatically downloaded, configured and installed, if you choose to enable it.
+
+	To enable the manifest please open the properties for each project in the solution, then 
+	navigate to the vcpkg section and Select "Yes" for "Use Manifest". Do so for both the 
+	"Debug" and "Release" project configurations.
+
+	2) Alternatively, You can manually install the dependencies, with the following commands:
+
 		vcpkg install nlohmann-json:x64-windows-static
 		vcpkg install boost-asio:x64-windows-static
 		vcpkg install boost-optional:x64-windows-static
@@ -29,10 +37,14 @@ BUILD INSTRUCTIONS AND DEPENDENCIES
 		vcpkg install boost-beast:x64-windows-static
 		vcpkg install wintoast:x64-windows-static
 		vcpkg install openssl:x64-windows-static
+	
+	Secondly, to be able to build the setup package please ensure that the WiX Toolset is 
+	installed (https://wixtoolset.org/) and that the WiX Toolset Visual Studio Extension 
+	(WiX v3	Visual Studio 2022 Extension) is installed.
 
 INSTALLATION, USAGE ETC
 
-https://github.com/JPersson77/LGTVCompanion
+	https://github.com/JPersson77/LGTVCompanion
 
 CHANGELOG
 	v 1.0.0             - Initial release

diff --git a/LGTV Companion UI/LGTV Companion UI.vcxproj b/LGTV Companion UI/LGTV Companion UI.vcxproj
@@ -86,7 +86,7 @@
     <TargetName>LGTV Companion</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/LGTV Companion User/LGTV Companion User.vcxproj b/LGTV Companion User/LGTV Companion User.vcxproj
@@ -87,7 +87,7 @@
     <TargetName>LGTVdaemon</TargetName>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+    <VcpkgEnableManifest>false</VcpkgEnableManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>