EmulatorPkg: Disable TftpDynamicCommand and LogoDxe for XCODE5

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.dsc

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index ea8b6ce76e24397e6af4b23b1ed979337d7169a7..20f118771393bb54f813015b53ac4c091fb689a1 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -4,7 +4,7 @@
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 # a real platform. This also provides an example for how an DSC is created.\r
 #\r
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>\r
 #\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -19,7 +19,7 @@
   OUTPUT_DIRECTORY               = Build/Emulator$(ARCH)\r
 \r
   SUPPORTED_ARCHITECTURES        = X64|IA32\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = EmulatorPkg/EmulatorPkg.fdf\r
 \r
@@ -236,18 +236,18 @@
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10\r
 \r
 [Components]\r
-!ifdef $(UNIX_SEC_BUILD)\r
-  ##\r
-  #  Emulator, OS POSIX application\r
-  ##\r
-  EmulatorPkg/Unix/Host/Host.inf\r
-!endif\r
-\r
-!ifdef $(WIN_SEC_BUILD)\r
-  ##\r
-  #  Emulator, OS WIN application\r
-  ##\r
-  EmulatorPkg/Win/Host/WinHost.inf\r
+!if "IA32" in $(ARCH) || "X64" in $(ARCH)\r
+  !if "MSFT" in $(FAMILY)\r
+    ##\r
+    #  Emulator, OS WIN application\r
+    ##\r
+    EmulatorPkg/Win/Host/WinHost.inf\r
+  !else\r
+    ##\r
+    #  Emulator, OS POSIX application\r
+    ##\r
+    EmulatorPkg/Unix/Host/Host.inf\r
+  !endif\r
 !endif\r
 \r
 !ifndef $(SKIP_MAIN_BUILD)\r
@@ -332,7 +332,9 @@
 \r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
   MdeModulePkg/Logo/LogoDxe.inf\r
+!endif\r
   MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
   MdeModulePkg/Application/UiApp/UiApp.inf {\r
    <LibraryClasses>\r
@@ -375,10 +377,12 @@
 \r
   FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
     <PcdsFixedAtBuild>\r
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
   }\r
+!endif\r
   ShellPkg/Application/Shell/Shell.inf {\r
     <LibraryClasses>\r
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
@@ -408,10 +412,14 @@
 !include NetworkPkg/Network.dsc.inc\r
 \r
 [BuildOptions]\r
+  #\r
+  # Disable deprecated APIs.\r
+  #\r
+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
+\r
   MSFT:DEBUG_*_*_CC_FLAGS = /Od /Oy-\r
   MSFT:NOOPT_*_*_CC_FLAGS = /Od /Oy-\r
 \r
   MSFT:*_*_*_DLINK_FLAGS     = /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CONSOLE\r
   MSFT:DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
   MSFT:NOOPT_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000\r
-\r