From 2db3021b9665e33491cc19afc8ca0dae306f1d67 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Mon, 5 Jan 2015 21:30:55 +1100 Subject: [PATCH] fix VS 12 checking batch (cherry picked from commit e4480e7d50e73c4d5fcf5ae1f59c5cd72a8fa8dc) Conflicts: qxldod/checkWin8Tools.bat --- qxldod/checkWin8Tools.bat | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/qxldod/checkWin8Tools.bat b/qxldod/checkWin8Tools.bat index c8008db..f81b853 100755 --- a/qxldod/checkWin8Tools.bat +++ b/qxldod/checkWin8Tools.bat @@ -1,16 +1,8 @@ -@echo off - -reg query "HKLM\Software\Microsoft\Windows Kits\WDK" /v WDKProductVersion >nul 2>nul -if %ERRORLEVEL% EQU 0 goto checkVS12 -reg query "HKLM\Software\Wow6432Node\Microsoft\Windows Kits\WDK" /v WDKProductVersion > nul 2>nul -if %ERRORLEVEL% EQU 0 goto checkVS12 -echo ERROR building Win8 drivers: Win8 WDK is not installed -exit /b 1 - -:checkVS12 -reg query HKLM\Software\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul -if %ERRORLEVEL% EQU 0 exit /b 0 -reg query HKLM\Software\Wow6432Node\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul -if %ERRORLEVEL% EQU 0 exit /b 0 -echo ERROR building Win8 drivers: VS11 is not installed -exit /b 2 \ No newline at end of file +@echo off + +reg query HKLM\Software\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul +if %ERRORLEVEL% EQU 0 exit /b 0 +reg query HKLM\Software\Wow6432Node\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul +if %ERRORLEVEL% EQU 0 exit /b 0 +echo ERROR building Win8 drivers: VS12 is not installed +exit /b 2