1 files changed, 9 insertions, 0 deletions
diff --git a/tools/mhmake/src/mhmake.cpp b/tools/mhmake/src/mhmake.cpp
index 7e9b117b2..375621fb4 100644
--- a/tools/mhmake/src/mhmake.cpp
+++ b/tools/mhmake/src/mhmake.cpp
@@ -50,6 +50,15 @@ int __CDECL main(int argc, char* argv[])
   //_CrtSetBreakAlloc(44);
   #endif
 
+  #ifdef WIN32
+  /* Remove the VS_UNICODE_OUTPUT environment variable. This variable is set when running from
+   * the Visual Studio IDE and is causing the output of cl.exe to send the output directly to the IDE instead
+   * of sending it to stdout. This is causing all scripts that are calling cl.exe and intercept the
+   * output to fail.
+   */
+  putenv("VS_UNICODE_OUTPUT=");
+  #endif
+
   try
   {
     mhmakefileparser::InitBuildTime();