From a8f2ca79a5d76958481f73101023b5d9018c0312 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Fri, 20 Jul 2018 23:43:25 -0400 Subject: [PATCH] Revert "fix? hostinterop" This reverts commit 314c17b4351c7676b92ec627f729fa0bc4157748. --- GUI.sln | 4 +-- GUI/GUI.csproj | 26 -------------------- GUI/HostInterop/HostInterop.cpp | 3 --- GUI/HostInterop/HostInterop.h | Bin 2234 -> 2098 bytes GUI/HostInterop/HostInterop.vcxproj | 3 +-- GUI/HostInterop/HostInterop.vcxproj.filters | 3 --- GUI/Program.cs | 2 -- 7 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 GUI/HostInterop/HostInterop.cpp diff --git a/GUI.sln b/GUI.sln index b1492e2..8f9287d 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|x86 - {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.Build.0 = Debug|x86 + {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}.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 fdc7587..2acd95c 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -31,26 +31,6 @@ 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 - @@ -95,11 +75,5 @@ - - - {c3534056-72b3-4651-b69c-6e428f675861} - HostInterop - - \ No newline at end of file diff --git a/GUI/HostInterop/HostInterop.cpp b/GUI/HostInterop/HostInterop.cpp deleted file mode 100644 index e582dec..0000000 --- a/GUI/HostInterop/HostInterop.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#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 f244d87865daf8bafd5607454428dc462cdc66ee..617c60f162c2ba46a86fc6549acbfabf96fa4dfa 100644 GIT binary patch delta 133 zcmdlbxJh8c3C79S80{u2F$GL+U~-y#g(-zQlOd0xgdvroh#_yXGqdgFKISQt4Opgd zCNbm#VGe`BA=XoY5Xlgq0}}O(c}bSx}!rp8-|pbf#49Jg7-! z45^dZnQhVZIWtd16S>Yj6^lvPEVt3rxw3v_2HH5el3jgr44V*&JqOusCvRg@0n6WH jGe?uNo;-n(WpWg|0#sg_9prK=2CK;nSwttVVQ&KfF~vX1 diff --git a/GUI/HostInterop/HostInterop.vcxproj b/GUI/HostInterop/HostInterop.vcxproj index 63af8b4..288a16c 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,7 +138,6 @@ - Create Create diff --git a/GUI/HostInterop/HostInterop.vcxproj.filters b/GUI/HostInterop/HostInterop.vcxproj.filters index de404d0..3e0ae9a 100644 --- a/GUI/HostInterop/HostInterop.vcxproj.filters +++ b/GUI/HostInterop/HostInterop.vcxproj.filters @@ -25,8 +25,5 @@ Source Files - - Source Files - \ No newline at end of file diff --git a/GUI/Program.cs b/GUI/Program.cs index 7179701..17aaf57 100644 --- a/GUI/Program.cs +++ b/GUI/Program.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; -using HostInterop; namespace GUI { @@ -15,7 +14,6 @@ namespace GUI [STAThread] static void Main() { - if (!Host.Start()) return; Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1());