NaCl settings and completed install scripts.

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs

Index: visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs
diff --git a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs
index 071d63e9234ee15f06377e54d14a6048f38d2143..414991af48a961ce1034f181293c1f455349bb39 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerHelper.cs
@@ -225,21 +225,20 @@ namespace NativeClientVSAddIn
       if (Utility.IsVisualCProject(startProject))
       {
         VCConfiguration config = Utility.GetActiveVCConfiguration(startProject);
-        VCProject vcproj = (VCProject)startProject.Object;
+        IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
         VCLinkerTool linker = config.Tools.Item("VCLinkerTool");
-        pluginProjectDirectory_ = vcproj.ProjectDirectory;  // Macros not allowed here.
-        pluginAssembly_ = config.Evaluate(linker.OutputFile);
+        VCProject vcproj = (VCProject)startProject.Object;
+        sdkRootDirectory_ = general.GetEvaluatedPropertyValue("VSNaClSDKRoot");
         pluginOutputDirectory_ = config.Evaluate(config.OutputDirectory);
+        pluginAssembly_ = config.Evaluate(linker.OutputFile);
+        pluginProjectDirectory_ = vcproj.ProjectDirectory;  // Macros not allowed here.
       }
       else
       {
         return false;
       }
 
-      // TODO(tysand): Add user option to specify this.
-      int webServerPort = 5103;
-      sdkRootDirectory_ = Environment.GetEnvironmentVariable(Strings.SDKPathEnvironmentVariable);
-      if (sdkRootDirectory_ == null)
+      if (string.IsNullOrEmpty(sdkRootDirectory_))
       {
         MessageBox.Show(
             string.Format(Strings.SDKPathNotSetFormat, Strings.SDKPathEnvironmentVariable));
@@ -248,6 +247,8 @@ namespace NativeClientVSAddIn
 
       sdkRootDirectory_ = sdkRootDirectory_.TrimEnd("/\\".ToArray<char>());
 
+      // TODO(tysand): Add user option to specify this.
+      int webServerPort = 5103;
       webServerExecutable_ = "python.exe";
       webServerArguments_ = string.Format(
           "{0}\\examples\\httpd.py --no_dir_check {1}",
@@ -255,7 +256,7 @@ namespace NativeClientVSAddIn
           webServerPort);
 
       // TODO(tysand): Update this to nacl-gdb when it is ready. Should be able to remove irtPath_.
-      gdbPath_ = sdkRootDirectory_ + @"\customGDB\gdb.exe";
+      gdbPath_ = sdkRootDirectory_ + @"\gdb-remote-x86-64\gdb.exe";
       irtPath_ = sdkRootDirectory_ + @"\tools\irt_x86_64.nexe";
 
       isProperlyInitialized_ = true;
@@ -329,7 +330,7 @@ namespace NativeClientVSAddIn
 
     /// <summary>
     /// This is called periodically by the Visual Studio UI thread to look for our plug-in process
-    /// and attach the debugger to it.  The call is triggered by the pluginFinderTimer_ object
+    /// and attach the debugger to it.  The call is triggered by the pluginFinderTimer_ object.
     /// </summary>
     /// <param name="unused">The parameter is not used.</param>
     /// <param name="unused1">The parameter is not used.</param>