Fix the Windows MNW2 build by updating the library paths and adding
support for VS2012 and VS2013.
--
Bruce Cran
From 523426fafd6757056db6dc0478036e6b22699df3 Mon Sep 17 00:00:00 2001
From: Bruce Cran <[email protected]>
Date: Thu, 15 Jan 2015 09:00:21 -0700
Subject: [PATCH] Fix the Windows MNW2 build
Fix the MNW2 (Minnowboard MAX) build by updating library locations and
adding support for VS2012 and VS2013.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <[email protected]>
---
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 22 +++++++++++-----------
Vlv2TbltDevicePkg/bld_vlv.bat | 28 ++++++++++++++++++++--------
2 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index bbfe471..0935fab 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -2,15 +2,15 @@
# Platform description.
#
# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
-#
+#
# This program and the accompanying materials are licensed and made available
under
-# the terms and conditions of the BSD License that accompanies this
distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-#
+# the terms and conditions of the BSD License that accompanies this
distribution.
+# The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
#
#**/
@@ -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 b9c86e3..a84d01b 100644
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -108,7 +108,7 @@ echo Setting %1 platform configuration and BIOS ID...
if /i "%~1" == "MNW2" (
echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env
echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
-
+
) else (
echo Error - Unsupported PlatformType: %1
goto Usage
@@ -127,7 +127,7 @@ if /i "%~2" == "RELEASE" (
:: 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\" (
@@ -135,17 +135,29 @@ if defined VS90COMNTOOLS (
) else (
set TOOL_CHAIN_TAG=VS2008x86
)
- ) else if defined VS100COMNTOOLS (
+) else if defined VS100COMNTOOLS (
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...
--
1.9.4.msysgit.2
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
