Browse Source

Ensure trailing slash on VS2015 detection, always set debug engine to native enabled avoiding possible hang from VS IDE

Josh Engebretson 8 years ago
parent
commit
eb13f519e5

+ 3 - 7
Source/ToolCore/NETTools/NETProjectGen.cpp

@@ -1220,13 +1220,9 @@ namespace ToolCore
 
 
                     propertyGroup.CreateChild("StartArguments").SetValue(startArguments);
                     propertyGroup.CreateChild("StartArguments").SetValue(startArguments);
 
 
-#ifdef ATOMIC_DEBUG
-                    // When building a debug build, default native code debugging to true
-                    if (cfg == "Debug")
-                    {
-                        propertyGroup.CreateChild("EnableUnmanagedDebugging").SetValue("true");
-                    }
-#endif                    
+                    // Always enabled unmanaged debugging, solve issues with release building hanging when run from IDE
+                    propertyGroup.CreateChild("EnableUnmanagedDebugging").SetValue("true");
+
                 }
                 }
 
 
 
 

+ 6 - 0
Source/ToolCore/NETTools/NETProjectSystem.cpp

@@ -523,6 +523,12 @@ namespace ToolCore
 
 
         if (idePath_.Length())
         if (idePath_.Length())
         {
         {
+            // Ensure the path ends with a slash
+            if (!idePath_.EndsWith("\\"))
+            {
+                idePath_ += "\\";
+            }
+
             idePath_.Replace("Tools\\", "IDE\\devenv.exe");
             idePath_.Replace("Tools\\", "IDE\\devenv.exe");
 
 
             if (!fileSystem->FileExists(idePath_))
             if (!fileSystem->FileExists(idePath_))