BaseTools/VfrCompile: Add check to avoid using NULL pointer

[mirror_edk2.git] / SourceLevelDebugPkg / SourceLevelDebugPkg.dsc

diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
index a7be9ad51c3ec6d09d14dfe25e8f68ca3be6a816..d9b1b84b15fc1454685354c37bae06d4062ecd02 100644 (file)
--- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
+++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
@@ -1,8 +1,7 @@
 ## @file\r
-#\r
 # Source Level Debug Package.\r
 #\r
-# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2016, 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
@@ -22,11 +21,11 @@
 [Defines]\r
   PLATFORM_NAME                  = SourceLevelDebugPkg\r
   PLATFORM_GUID                  = 38C85805-883F-4ee8-A854-95B966ED73AA\r
-  PLATFORM_VERSION               = 0.86\r
+  PLATFORM_VERSION               = 0.96\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/SourceLevelDebugPkg\r
   SUPPORTED_ARCHITECTURES        = IA32|X64\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 [LibraryClasses.common]\r
@@ -51,8 +50,10 @@
 !ifdef $(SOURCE_DEBUG_USE_USB)\r
   DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.inf\r
 !else\r
+!ifndef $(SOURCE_DEBUG_USE_USB3)\r
   DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf\r
 !endif\r
+!endif\r
 \r
 [LibraryClasses.common.PEIM]\r
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
@@ -61,6 +62,9 @@
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf\r
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
+!ifdef $(SOURCE_DEBUG_USE_USB3)\r
+  DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf\r
+!endif\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
@@ -71,6 +75,9 @@
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
+!ifdef $(SOURCE_DEBUG_USE_USB3)\r
+  DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf\r
+!endif\r
 \r
 ###################################################################################################\r
 #\r
@@ -100,3 +107,6 @@
   SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf\r
   SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf\r
   SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.inf\r
+\r
+[BuildOptions]\r
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r