1 files changed, 17 insertions, 0 deletions
diff --git a/mach.bat b/mach.bat
index d98f7953934..e7cba6681bd 100644
--- a/mach.bat
+++ b/mach.bat
@@ -1,2 +1,19 @@
 @echo off
+
+SET VS_VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat
+IF EXIST "%VS_VCVARS%" (
+  IF NOT DEFINED VisualStudioVersion (
+    IF EXIST "%ProgramFiles(x86)%" (
+      call "%VS_VCVARS%" x64
+    ) ELSE (
+      ECHO 32-bit Windows is currently unsupported.
+      EXIT /B
+    )
+  )
+) ELSE (
+  ECHO Visual Studio 2015 is not installed.
+  ECHO Download and install Visual Studio 2015 from https://www.visualstudio.com/
+  EXIT /B
+)
+
 python mach %*