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 <bruce.cran@gmail.com>
Reviewed-by: David Wei <david.wei@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16657 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 113d28275097bb2ba337eb71f5972132288a97bc..540796872d651aec99b5f0d6c252fc5b14eeaa6b 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -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

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index bbfe47157477d0212b84b1415442188c3e197b6d..6ba4f6a64d9448645c1da0a252dbdfeff9a05f44 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -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

diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index b9c86e356952b7962e6f853ac980348453b35844..fc97f425342598e90e0f79dc80a0829b98ff7262 100644 (file)
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -124,13 +124,13 @@ if /i "%~2" == "RELEASE" (
 )\r
 \r
 ::**********************************************************************\r
-:: Additional EDK Build Setup/Configuration\r
-::**********************************************************************\r
-echo.\r
-echo Setting the Build environment for VS2008/VS2010...\r
-if defined VS90COMNTOOLS (\r
-   if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"\r
-   if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (\r
+:: Additional EDK Build Setup/Configuration
+::**********************************************************************
+echo.
+echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...\r
+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\r
    ) else (\r
       set TOOL_CHAIN_TAG=VS2008x86\r
@@ -139,14 +139,28 @@ if defined VS90COMNTOOLS (
   if not defined VSINSTALLDIR call "%VS100COMNTOOLS%\vsvars32.bat"\r
   if /I "%VS100COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\" (\r
     set TOOL_CHAIN_TAG=VS2010\r
-) else (\r
-    set TOOL_CHAIN_TAG=VS2010x86\r
- )\r
-) else (\r
-   echo  --ERROR: VS2008/VS2010 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS not defined ^^!\r
-   echo.\r
-   goto :BldFail\r
-)\r
+  ) else (\r
+    set TOOL_CHAIN_TAG=VS2010x86
+  )\r
+) else if defined VS110COMNTOOLS (\r
+  if not defined VSINSTALLDIR call "%VS110COMNTOOLS%\vsvars32.bat"\r
+  if /I "%VS110COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 11.0\Common7\Tools\" (\r
+    set TOOL_CHAIN_TAG=VS2012\r
+  ) else (\r
+    set TOOL_CHAIN_TAG=VS2012x86\r
+  )\r
+) else if defined VS120COMNTOOLS (\r
+  if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"\r
+  if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (\r
+    set TOOL_CHAIN_TAG=VS2013\r
+  ) else (\r
+    set TOOL_CHAIN_TAG=VS2013x86\r
+  )\r
+) else (
+  echo  --ERROR: VS2008/VS2010/VS2012/VS2013 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!\r
+  echo.\r
+  goto :BldFail\r
+)
 \r
 echo Ensuring correct build directory is present for GenBiosId...\r
 set BUILD_PATH=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\r