BaseTools/VfrCompile/Pccts: Make assignment operator not returning void

[mirror_edk2.git] / BaseTools / Scripts / SetVisualStudio.bat

diff --git a/BaseTools/Scripts/SetVisualStudio.bat b/BaseTools/Scripts/SetVisualStudio.bat
old mode 100644 (file)
new mode 100755 (executable)
index a302a83..de2f912
--- a/BaseTools/Scripts/SetVisualStudio.bat
+++ b/BaseTools/Scripts/SetVisualStudio.bat
@@ -25,6 +25,11 @@
 \r
 :CheckLatest\r
 echo.\r
+@if defined VS140COMNTOOLS (\r
+   @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64"\r
+   @goto SetVs\r
+)\r
+\r
 @if defined VS120COMNTOOLS (\r
    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64"\r
    @goto SetVs\r
@@ -68,7 +73,7 @@ if not exist "%COMMONTOOLSx64%\vcvarsx86_amd64.bat" (
 @goto End\r
 \r
 :RebuildTools\r
-@call python "%WORKSPACE%\BaseTools\Scripts\UpdateBuildVersions.py"\r
+@call python "%BASE_TOOLS_PATH%\Scripts\UpdateBuildVersions.py"\r
 @set "BIN_DIR=%EDK_TOOLS_PATH%\Bin\Win32"\r
 if not exist "%BIN_DIR%" @mkdir "%BIN_DIR%"\r
 @echo Removing temporary and binary files\r