Skip to content

Commit

Permalink
Made release was building 64x since native .dll is 64 bit. Also added…
Browse files Browse the repository at this point in the history
… overrall try catch.
  • Loading branch information
GlutenBoy committed Nov 23, 2016
1 parent af2ef3e commit 11640e1
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 10 deletions.
1 change: 1 addition & 0 deletions LogitechProfilePlus.Windows/LogitechGSDK.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ public enum KeyboardNames
NUM_PERIOD = 0x53,
G_LOGO = 0xFFFF1,
G_2 = 0xFFF2,
MUTE = 0xE2,


};
Expand Down
23 changes: 22 additions & 1 deletion LogitechProfilePlus.Windows/LogitechProfilePlus.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,38 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>LogitechProfilePlus.Windows.Program</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down
17 changes: 12 additions & 5 deletions LogitechProfilePlus.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@ static class Program

static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Form MainForm = new frmMain();
Application.Run();
//MainForm.Visible = false;
try
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Form MainForm = new frmMain();
Application.Run();
}
catch (Exception e)
{
MessageBox.Show("Error: " + e.Message);
}

}
}
}
1 change: 0 additions & 1 deletion LogitechProfilePlus.Windows/frmMain.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion LogitechProfilePlus.Windows/frmMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public partial class frmMain : Form
Profiles _profiles = new Profiles();
ProfileData _currentProfile;
bool _exitApplication = false;
int _currentDebugScanCode = 1000;

/// <summary>
/// Constructor
Expand Down Expand Up @@ -200,6 +199,8 @@ private void SetKeysTag()
btnNumpadPLus.Tag = LedCSharp.KeyboardNames.NUM_PLUS.ToString();
btnNumpadEnter.Tag = LedCSharp.KeyboardNames.NUM_ENTER.ToString();
btnNumpadDot.Tag = LedCSharp.KeyboardNames.NUM_PERIOD.ToString();

btnMute.Tag = LedCSharp.KeyboardNames.MUTE.ToString();
}

private void KeyboardClick(object sender, EventArgs e)
Expand Down
6 changes: 4 additions & 2 deletions LogitechProfilePlus.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "releases", "releases", "{05C9513F-C46D-4086-81ED-EA16B3FD6927}"
ProjectSection(SolutionItems) = preProject
releases\ProfilePlusG810_V01.zip = releases\ProfilePlusG810_V01.zip
binaries\ProfilePlusG810_V02.zip = binaries\ProfilePlusG810_V02.zip
EndProjectSection
EndProject
Global
Expand All @@ -36,8 +37,9 @@ Global
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|Any CPU.Build.0 = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x64.ActiveCfg = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x64.Build.0 = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x86.ActiveCfg = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x86.Build.0 = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x64.Deploy.0 = Release|Any CPU
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x86.ActiveCfg = Release|x86
{7CB9119A-0ED2-4A53-B3E6-FFE3E4B35827}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file added binaries/ProfilePlusG810_V02.zip
Binary file not shown.

0 comments on commit 11640e1

Please sign in to comment.