Revision: 16431
          http://sourceforge.net/p/edk2/code/16431
Author:   vanjeff
Date:     2014-11-25 07:12:28 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Sync patch r16277 from main trunk.

Update edksetup.bat to support Microsoft Visual Studio 2013 when building the 
Nt32Pkg emulation platform (enabled using the --nt32 flag).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lhauch <[email protected]>
Reviewed-by: Jaben Carsey <[email protected]>

(cherry picked from commit efbdab2014f869b31b77ec5fa2f3f79fbd41cee1)

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/16277

Modified Paths:
--------------
    branches/UDK2014.SP1/edksetup.bat

Modified: branches/UDK2014.SP1/edksetup.bat
===================================================================
--- branches/UDK2014.SP1/edksetup.bat   2014-11-25 07:11:54 UTC (rev 16430)
+++ branches/UDK2014.SP1/edksetup.bat   2014-11-25 07:12:28 UTC (rev 16431)
@@ -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 @@
 @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.
+            )
           )
         )
       )


------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to