Skip to content

Commit 5875eea

Browse files
infra223infra223
committed
Add OpenRGB integration; Framework upgrade to 4.8;
1 parent 9108ac3 commit 5875eea

44 files changed

Lines changed: 2479 additions & 312 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Makefile</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v142</PlatformToolset>
30+
<PlatformToolset>v143</PlatformToolset>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3333
<ConfigurationType>Makefile</ConfigurationType>
3434
<UseDebugLibraries>false</UseDebugLibraries>
35-
<PlatformToolset>v142</PlatformToolset>
35+
<PlatformToolset>v143</PlatformToolset>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3838
<ConfigurationType>Makefile</ConfigurationType>
3939
<UseDebugLibraries>true</UseDebugLibraries>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4343
<ConfigurationType>Makefile</ConfigurationType>
4444
<UseDebugLibraries>false</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4848
<ImportGroup Label="ExtensionSettings">
@@ -118,6 +118,9 @@
118118
<None Include="scripts\products\winversion.iss" />
119119
<None Include="Setup LogiLockLED.iss" />
120120
</ItemGroup>
121+
<ItemGroup>
122+
<ClInclude Include="scripts\products\dotnetfx48.iss" />
123+
</ItemGroup>
121124
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
122125
<ImportGroup Label="ExtensionTargets">
123126
</ImportGroup>

‎Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,7 @@
9696
<Filter>scripts\products</Filter>
9797
</None>
9898
</ItemGroup>
99+
<ItemGroup>
100+
<ClInclude Include="scripts\products\dotnetfx48.iss" />
101+
</ItemGroup>
99102
</Project>

‎Inno Setup LogiLockLED/Setup LogiLockLED.iss‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
88
AppId={{37738065-07D8-4618-9F70-62F502D902BB}
99
AppName=LogiLockLED
10-
AppVersion=1.3
10+
AppVersion=1.4
1111
;AppVerName=LogiLockLED 1.0
1212
AppPublisherURL=https://github.com/infra223/LogiLockLED
1313
AppSupportURL=https://github.com/infra223/LogiLockLED
@@ -25,14 +25,15 @@ UninstallDisplayIcon={app}\LogiLockLED.exe
2525
#include "scripts\products\stringversion.iss"
2626
#include "scripts\products\winversion.iss"
2727
#include "scripts\products\dotnetfxversion.iss"
28-
#include "scripts\products\dotnetfx46.iss"
28+
//#include "scripts\products\dotnetfx46.iss"
29+
#include "scripts\products\dotnetfx48.iss"
2930

3031
[Code]
3132
function InitializeSetup(): Boolean;
3233
begin
3334
// initialize windows version
3435
initwinversion();
35-
dotnetfx46(60); // install if version < 4.6.0
36+
dotnetfx48(80); // install if version < 4.8.0
3637
Result := true;
3738
end;
3839
@@ -44,6 +45,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
4445
Source: "..\LogiLockLED\bin\Release\LogiLockLED.exe"; DestDir: "{app}"; Flags: ignoreversion
4546
Source: "..\LogiLockLED\bin\Release\LogiLockLED.exe.config"; DestDir: "{app}"; Flags: ignoreversion
4647
Source: "..\LogiLockLED\bin\Release\LogitechLedEnginesWrapper.dll"; DestDir: "{app}"; Flags: ignoreversion
48+
Source: "..\LogiLockLED\bin\Release\OpenRGB.NET.dll"; DestDir: "{app}"; Flags: ignoreversion
4749
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
4850

4951
[Icons]

‎Inno Setup LogiLockLED/scripts/products/dotnetfx48.iss‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// requires Windows 7 Service Pack 1, Windows 8.1, Windows Server 2008 R2 SP1, Windows Server 2012, Windows Server 2012 R2
2+
// express setup (downloads and installs the components depending on your OS) if you want to deploy it locally download the full installer on website below
3+
// https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net481-offline-installer
4+
5+
[CustomMessages]
6+
dotnetfx48_title=.NET Framework 4.8.1
7+
8+
dotnetfx48_size=59 MB
9+
10+
[Code]
11+
const
12+
dotnetfx48_url = 'https://go.microsoft.com/fwlink/?LinkId=2203304';
13+
14+
procedure dotnetfx48(minVersion: Integer);
15+
begin
16+
if (dotnetfxspversion(NetFx4x, '') < minVersion) then
17+
AddProduct('dotnetfx48.exe',
18+
'/lcid ' + CustomMessage('lcid') + ' /passive /norestart',
19+
CustomMessage('dotnetfx48_title'),
20+
CustomMessage('dotnetfx48_size'),
21+
dotnetfx48_url,
22+
false, false, false);
23+
end;

‎LICENSE‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
LogiLockLED
2+
https://github.com/infra223/LogiLockLED
3+
================================================================================
14
MIT License
25

3-
Copyright (c) 2020 infra223
6+
Copyright (c) 2022 infra223
47

58
Permission is hereby granted, free of charge, to any person obtaining a copy
69
of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +22,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1922
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2023
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2124
SOFTWARE.
25+
26+
27+
28+
OpenRGB.Net
29+
https://github.com/diogotr7/OpenRGB.NET
30+
================================================================================
31+
MIT License
32+
33+
Copyright (c) 2022 Diogo Trindade
34+
35+
Permission is hereby granted, free of charge, to any person obtaining a copy
36+
of this software and associated documentation files (the "Software"), to deal
37+
in the Software without restriction, including without limitation the rights
38+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
39+
copies of the Software, and to permit persons to whom the Software is
40+
furnished to do so, subject to the following conditions:
41+
42+
The above copyright notice and this permission notice shall be included in all
43+
copies or substantial portions of the Software.
44+
45+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
46+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
47+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
48+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
49+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
50+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
51+
SOFTWARE.

‎LogiLockLED.sln‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30503.244
4+
VisualStudioVersion = 16.0.33027.164
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogiLockLED", "LogiLockLED\LogiLockLED.csproj", "{FCB10E99-94CD-4CB1-8BEA-B092C9AEC878}"
77
EndProject
@@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Inno Setup LogiLockLED", "I
1010
{FCB10E99-94CD-4CB1-8BEA-B092C9AEC878} = {FCB10E99-94CD-4CB1-8BEA-B092C9AEC878}
1111
EndProjectSection
1212
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRGB.NET", "OpenRGB.NET\OpenRGB.NET.csproj", "{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}"
14+
EndProject
1315
Global
1416
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1517
Debug|Any CPU = Debug|Any CPU
@@ -42,6 +44,18 @@ Global
4244
{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x64.Build.0 = Release|x64
4345
{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x86.ActiveCfg = Release|Win32
4446
{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x86.Build.0 = Release|Win32
47+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x64.ActiveCfg = Debug|Any CPU
50+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x64.Build.0 = Debug|Any CPU
51+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x86.ActiveCfg = Debug|Any CPU
52+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x86.Build.0 = Debug|Any CPU
53+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x64.ActiveCfg = Release|Any CPU
56+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x64.Build.0 = Release|Any CPU
57+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x86.ActiveCfg = Release|Any CPU
58+
{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x86.Build.0 = Release|Any CPU
4559
EndGlobalSection
4660
GlobalSection(SolutionProperties) = preSolution
4761
HideSolutionNode = FALSE

‎LogiLockLED/App.config‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="LogiLockLED.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="LogiLockLED.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
1010
</startup>
1111
<userSettings>
1212
<LogiLockLED.Properties.Settings>
@@ -106,6 +106,9 @@
106106
<setting name="OsdShowScroll" serializeAs="String">
107107
<value>True</value>
108108
</setting>
109+
<setting name="LedController" serializeAs="String">
110+
<value>OpenRGB</value>
111+
</setting>
109112
</LogiLockLED.Properties.Settings>
110113
</userSettings>
111-
</configuration>
114+
</configuration>

0 commit comments

Comments
 (0)