From 5d9cd24ede010b95b4e7ca891de1c9c10a0faa2e Mon Sep 17 00:00:00 2001
From: Wang Yu <yu.wang@intel.com>
Date: Thu, 3 Dec 2015 03:19:01 +0000
Subject: BaseTools: Add VS2015 tool chain in tools_def.template

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Yu <yu.wang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19101 6f19259b-4bc3-4df7-8a09-765794883524
---
 edksetup.bat | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'edksetup.bat')

diff --git a/edksetup.bat b/edksetup.bat
index b63c29916b..b69bd26857 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 - 2014, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2015, 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
@@ -63,27 +63,31 @@ if /I not "%1"=="--nt32" goto no_nt32
 @REM and headers to interface with Windows.
 
 if not defined VCINSTALLDIR (
-  if defined VS120COMNTOOLS (
-    call "%VS120COMNTOOLS%\vsvars32.bat"
+  if defined VS140COMNTOOLS (
+    call "%VS140COMNTOOLS%\vsvars32.bat"
   ) else (
-    if defined VS110COMNTOOLS (
-      call "%VS110COMNTOOLS%\vsvars32.bat"
-    ) else (
-      if defined VS100COMNTOOLS (
-        call "%VS100COMNTOOLS%\vsvars32.bat"
+    if defined VS120COMNTOOLS (
+      call "%VS120COMNTOOLS%\vsvars32.bat"
+    ) else (	
+      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.
+              )
             )
           )
         )
-- 
cgit v1.2.3