X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=25a5a6e8d7e37f11ab7f0ffd8c4f332c6e16514e;hp=ba775ce2da09019c6c53424106ca7485d30fb94c;hb=d63a52ebf3ab50ef3578ec412bc5e8675d33e503;hpb=1f9c86067477e7e898773518a244a09ebb086385

diff --git a/edksetup.bat b/edksetup.bat
index ba775ce2da..25a5a6e8d7 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
 @REM @file
 @REM   Windows batch file to setup a WORKSPACE environment
 @REM
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 @REM This program and the accompanying materials
 @REM are licensed and made available under the terms and conditions of the BSD License
 @REM which accompanies this distribution.  The full text of the license may be found at
@@ -61,24 +61,28 @@ if /I not "%1"=="--nt32" goto no_nt32
 @REM and headers to interface with Windows.
 
 if not defined VCINSTALLDIR (
-  if defined VS110COMNTOOLS (
-    call "%VS110COMNTOOLS%\vsvars32.bat"
+  if defined VS120COMNTOOLS (
+    call "%VS120COMNTOOLS%\vsvars32.bat"
   ) else (
-    if defined VS100COMNTOOLS (
-      call "%VS100COMNTOOLS%\vsvars32.bat"
+    if defined VS110COMNTOOLS (
+      call "%VS110COMNTOOLS%\vsvars32.bat"
     ) else (
-      if defined VS90COMNTOOLS (
-        call "%VS90COMNTOOLS%\vsvars32.bat"
+      if defined VS100COMNTOOLS (
+        call "%VS100COMNTOOLS%\vsvars32.bat"
       ) else (
-        if defined VS80COMNTOOLS (
-          call "%VS80COMNTOOLS%\vsvars32.bat"
+        if defined VS90COMNTOOLS (
+          call "%VS90COMNTOOLS%\vsvars32.bat"
         ) else (
-          if defined VS71COMNTOOLS (
-            call "%VS71COMNTOOLS%\vsvars32.bat"
+          if defined VS80COMNTOOLS (
+            call "%VS80COMNTOOLS%\vsvars32.bat"
           ) else (
-            echo.
-            echo !!! WARNING !!! Cannot find Visual Studio !!!
-            echo.
+            if defined VS71COMNTOOLS (
+              call "%VS71COMNTOOLS%\vsvars32.bat"
+            ) else (
+              echo.
+              echo !!! WARNING !!! Cannot find Visual Studio !!!
+              echo.
+            )
           )
         )
       )
@@ -89,7 +93,7 @@ shift
 
 :no_nt32
 if /I "%1"=="NewBuild" shift
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
 call %EDK_TOOLS_PATH%\toolsetup.bat %*
 if /I "%1"=="Reconfig" shift