Revision: 16667
http://sourceforge.net/p/edk2/code/16667
Author: zwei4
Date: 2015-01-27 07:58:24 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Fix the Windows MNW2 build failure.(Sync from EDK2 trunk)
Fix the Windows MNW2 build by adding support for VS2012 and VS2013.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <[email protected]>
Reviewed-by: David Wei <[email protected]>
Modified Paths:
--------------
branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat 2015-01-27 07:34:32 UTC
(rev 16666)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/bld_vlv.bat 2015-01-27 07:58:24 UTC
(rev 16667)
@@ -127,7 +127,7 @@
:: Additional EDK Build Setup/Configuration
::**********************************************************************
echo.
-echo Setting the Build environment for VS2008/VS2010...
+echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...
if defined VS90COMNTOOLS (
if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"
if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio
9.0\Common7\Tools\" (
@@ -139,13 +139,27 @@
if not defined VSINSTALLDIR call "%VS100COMNTOOLS%\vsvars32.bat"
if /I "%VS100COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio
10.0\Common7\Tools\" (
set TOOL_CHAIN_TAG=VS2010
-) else (
+ ) else (
set TOOL_CHAIN_TAG=VS2010x86
- )
+ )
+) else if defined VS110COMNTOOLS (
+ if not defined VSINSTALLDIR call "%VS110COMNTOOLS%\vsvars32.bat"
+ if /I "%VS110COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio
11.0\Common7\Tools\" (
+ set TOOL_CHAIN_TAG=VS2012
+ ) else (
+ set TOOL_CHAIN_TAG=VS2012x86
+ )
+) else if defined VS120COMNTOOLS (
+ if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
+ if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio
12.0\Common7\Tools\" (
+ set TOOL_CHAIN_TAG=VS2013
+ ) else (
+ set TOOL_CHAIN_TAG=VS2013x86
+ )
) else (
- echo --ERROR: VS2008/VS2010 not installed correctly.
VS90COMNTOOLS/VS100COMNTOOLS not defined ^^!
- echo.
- goto :BldFail
+ echo --ERROR: VS2008/VS2010/VS2012/VS2013 not installed correctly.
VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!
+ echo.
+ goto :BldFail
)
echo Ensuring correct build directory is present for GenBiosId...
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
