diff --git a/GUI.sln b/GUI.sln index 8f9287d..b1492e2 100644 --- a/GUI.sln +++ b/GUI.sln @@ -21,8 +21,8 @@ Global {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|Any CPU.Build.0 = Debug|Any CPU {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x64.ActiveCfg = Debug|Any CPU {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x64.Build.0 = Debug|Any CPU - {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.ActiveCfg = Debug|Any CPU - {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.Build.0 = Debug|Any CPU + {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.ActiveCfg = Debug|x86 + {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.Build.0 = Debug|x86 {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|Any CPU.ActiveCfg = Release|Any CPU {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|Any CPU.Build.0 = Release|Any CPU {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj index 2acd95c..fdc7587 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -31,6 +31,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + @@ -75,5 +95,11 @@ + + + {c3534056-72b3-4651-b69c-6e428f675861} + HostInterop + + \ No newline at end of file diff --git a/GUI/HostInterop/HostInterop.cpp b/GUI/HostInterop/HostInterop.cpp new file mode 100644 index 0000000..e582dec --- /dev/null +++ b/GUI/HostInterop/HostInterop.cpp @@ -0,0 +1,3 @@ +#include "stdafx.h" + +#include "HostInterop.h" \ No newline at end of file diff --git a/GUI/HostInterop/HostInterop.h b/GUI/HostInterop/HostInterop.h index 617c60f..f244d87 100644 Binary files a/GUI/HostInterop/HostInterop.h and b/GUI/HostInterop/HostInterop.h differ diff --git a/GUI/HostInterop/HostInterop.vcxproj b/GUI/HostInterop/HostInterop.vcxproj index 288a16c..63af8b4 100644 --- a/GUI/HostInterop/HostInterop.vcxproj +++ b/GUI/HostInterop/HostInterop.vcxproj @@ -93,7 +93,7 @@ Use - + ..\..\CMakeBuilds\build\x86-Debug\texthook\vnrhost.lib;%(AdditionalDependencies) @@ -138,6 +138,7 @@ + Create Create diff --git a/GUI/HostInterop/HostInterop.vcxproj.filters b/GUI/HostInterop/HostInterop.vcxproj.filters index 3e0ae9a..de404d0 100644 --- a/GUI/HostInterop/HostInterop.vcxproj.filters +++ b/GUI/HostInterop/HostInterop.vcxproj.filters @@ -25,5 +25,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/GUI/Program.cs b/GUI/Program.cs index 17aaf57..7179701 100644 --- a/GUI/Program.cs +++ b/GUI/Program.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using HostInterop; namespace GUI { @@ -14,6 +15,7 @@ namespace GUI [STAThread] static void Main() { + if (!Host.Start()) return; Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1());