MdePkg/UefiDevicePathLib: Rename StrToGuid to avoid link failure

[mirror_edk2.git] / ShellPkg / ShellPkg.dsc

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 364a622452f34f0da3cbc84dc4d82606290d7657..5c01933c5265d6210c8b28f96e51bf8f4efd3f83 100644 (file)
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
 ##  @file\r
 # Shell Package\r
 #\r
-# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -27,7 +27,11 @@
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf\r
+!if $(TARGET) == RELEASE\r
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+!else\r
   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
+!endif\r
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
@@ -80,7 +84,9 @@
   #\r
   ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
   ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
+  ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
   ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
+  ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
   ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf\r
   ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf\r
   ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf\r
@@ -93,7 +99,6 @@
 \r
   ShellPkg/Library/UefiDpLib/UefiDpLib.inf {\r
     <LibraryClasses>\r
-      TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
       PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
       DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf\r
   }\r
@@ -118,3 +123,5 @@
 !endif #$(NO_SHELL_PROFILES)\r
   }\r
 \r
+[BuildOptions]\r
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r