Browse Source

Merge pull request #1067 from AtomicGameEngine/JME-ATOMICNET-FIXVCREQ

Use VSMSBuildCmd.bat instead of vcvars64.bat for editor C# builds (the later requires C++ tooling to be installed)
JoshEngebretson 9 years ago
parent
commit
3b7f724fd9
1 changed files with 7 additions and 2 deletions
  1. 7 2
      Source/ToolCore/NETTools/NETBuildSystem.cpp

+ 7 - 2
Source/ToolCore/NETTools/NETBuildSystem.cpp

@@ -291,7 +291,12 @@ namespace ToolCore
                 return;
                 return;
             }
             }
 
 
-            String vcvars64 = ToString("%s..\\..\\VC\\bin\\amd64\\vcvars64.bat", cmdToolsPath.CString());
+            if (!cmdToolsPath.EndsWith("\\"))
+            {
+                cmdToolsPath += "\\";
+            }
+
+            String msbuildcmd = ToString("%sVsMSBuildCmd.bat", cmdToolsPath.CString());
 
 
             String cmd = "cmd";
             String cmd = "cmd";
 
 
@@ -299,7 +304,7 @@ namespace ToolCore
             args.Push("/C");
             args.Push("/C");
 
 
             // vcvars bat
             // vcvars bat
-            String compile = ToString("\"\"%s\" ", vcvars64.CString());
+            String compile = ToString("\"\"%s\" ", msbuildcmd.CString());
 
 
             if (requiresNuGet)
             if (requiresNuGet)
             {
             {