Revision: 16657
http://sourceforge.net/p/edk2/code/16657
Author: zwei4
Date: 2015-01-26 06:50:22 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
Fix the Windows MNW2 build failure.
Fix the Windows MNW2 build by updating the library paths and 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:
--------------
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
trunk/edk2/Vlv2TbltDevicePkg/bld_vlv.bat
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc 2015-01-23 16:10:00 UTC
(rev 16656)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc 2015-01-26 06:50:22 UTC
(rev 16657)
@@ -264,8 +264,8 @@
!endif
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
- SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+ SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
@@ -1000,7 +1000,7 @@
!endif
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
<LibraryClasses>
- FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
}
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc 2015-01-23 16:10:00 UTC
(rev 16656)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc 2015-01-26 06:50:22 UTC
(rev 16657)
@@ -264,8 +264,8 @@
!endif
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
- SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+ SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
@@ -1000,7 +1000,7 @@
!endif
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
<LibraryClasses>
- FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
}
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
Modified: trunk/edk2/Vlv2TbltDevicePkg/bld_vlv.bat
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/bld_vlv.bat 2015-01-23 16:10:00 UTC (rev
16656)
+++ trunk/edk2/Vlv2TbltDevicePkg/bld_vlv.bat 2015-01-26 06:50:22 UTC (rev
16657)
@@ -124,13 +124,13 @@
)
::**********************************************************************
-:: Additional EDK Build Setup/Configuration
-::**********************************************************************
-echo.
-echo Setting the Build environment for VS2008/VS2010...
-if defined VS90COMNTOOLS (
- if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"
- if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio
9.0\Common7\Tools\" (
+:: Additional EDK Build Setup/Configuration
+::**********************************************************************
+echo.
+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\" (
set TOOL_CHAIN_TAG=VS2008
) else (
set TOOL_CHAIN_TAG=VS2008x86
@@ -139,14 +139,28 @@
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 (
- set TOOL_CHAIN_TAG=VS2010x86
- )
-) else (
- echo --ERROR: VS2008/VS2010 not installed correctly.
VS90COMNTOOLS/VS100COMNTOOLS not defined ^^!
- echo.
- goto :BldFail
-)
+ ) 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/VS2012/VS2013 not installed correctly.
VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!
+ echo.
+ goto :BldFail
+)
echo Ensuring correct build directory is present for GenBiosId...
set BUILD_PATH=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%
------------------------------------------------------------------------------
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
