From 5c8b2de82f7b59b11508adf2e717bd17700ecd2a Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Fri, 23 Jul 2010 17:01:35 +0000
Subject: [PATCH]

---
 .../AD7.Impl/AD7Process.cs                     | 18 +++++++++---------
 .../Cosmos.Debug.VSDebugEngine.csproj          |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
index ea84ddcb6..c866da4ec 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
@@ -17,7 +17,7 @@ using System.IO;
 using Cosmos.Compiler.Debug;
 using System.Collections.Specialized;
 using Cosmos.Debug.Common;
-//using Cosmos.Build.Common;
+using Cosmos.Build.Common;
 
 namespace Cosmos.Debug.VSDebugEngine
 {
@@ -35,7 +35,7 @@ namespace Cosmos.Debug.VSDebugEngine
         internal uint? mCurrentAddress = null;
         internal string mISO;
         private readonly NameValueCollection mDebugInfo;
-        //protected TargetHost mTargetHost;
+        protected TargetHost mTargetHost;
 
         protected void LaunchQEMU(bool aGDB) {
             var xDebugConnectorStr = "-serial tcp:127.0.0.1:4444";
@@ -125,10 +125,10 @@ namespace Cosmos.Debug.VSDebugEngine
 
             mProcessStartInfo = new ProcessStartInfo(Path.Combine(PathUtilities.GetVSIPDir(), "Cosmos.Debug.HostProcess.exe"));
             if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "qemu")) {
-//                mTargetHost = TargetHost.QEMU;
+                mTargetHost = TargetHost.QEMU;
                 LaunchQEMU(xGDBDebugStub);
             } else if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "VMWareWorkstation")) {
-                //assemblyref://FSharp.CoremTargetHost = TargetHost.VMWareWorkstation;
+                mTargetHost = TargetHost.VMWareWorkstation;
                 LaunchVMWareWorkstation(xGDBDebugStub);
             } else {
                 throw new Exception("Invalid BuildTarget value: '" + mDebugInfo["BuildTarget"] + "'!");
@@ -366,11 +366,11 @@ namespace Cosmos.Debug.VSDebugEngine
             // that allows VS to "see" that. Here we resume it.
             mProcess.StandardInput.WriteLine();
 
-            //if (mTargetHost == TargetHost.QEMU) {
-            //    // QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do.
-            //    // We have to do this after we release the debug host though.
-            //    mDebugEngine.DebugConnector.WaitConnect();
-            //}
+            if (mTargetHost == TargetHost.QEMU) {
+               // QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do.
+               // We have to do this after we release the debug host though.
+               mDebugEngine.DebugConnector.WaitConnect();
+            }
         }
 
         void mProcess_Exited(object sender, EventArgs e)
diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
index c03566c05..c8d1482ab 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
@@ -120,6 +120,10 @@
       <Project>{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}</Project>
       <Name>Cosmos.Compiler.Debug</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
+      <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
+      <Name>Cosmos.Build.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Build\Cosmos.Build.Launch\Cosmos.Build.Launch.csproj">
       <Project>{3B8CD27E-9E91-4472-A4D9-9B3D581A5316}</Project>
       <Name>Cosmos.Build.Launch</Name>