Merged socket development branch:

[mirror_edk2.git] / AppPkg / AppPkg.dsc

diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index 7bc8f85d92268b88e54f2b70506e4924062a210f..60ff05fa4169f0e7268f25cbab65f021c1f9e66a 100644 (file)
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -41,6 +41,7 @@
   #\r
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
   #\r
   # Common Libraries\r
   #\r
@@ -64,45 +65,13 @@
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf\r
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+\r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
   FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
+  PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf\r
 \r
-  #\r
-  # C Standard Libraries\r
-  #\r
-  LibC|StdLib/LibC/LibC.inf\r
-  LibStdLib|StdLib/LibC/StdLib/StdLib.inf\r
-  LibString|StdLib/LibC/String/String.inf\r
-  LibWchar|StdLib/LibC/Wchar/Wchar.inf\r
-  LibCType|StdLib/LibC/Ctype/Ctype.inf\r
-  LibTime|StdLib/LibC/Time/Time.inf\r
-  LibStdio|StdLib/LibC/Stdio/Stdio.inf\r
-  LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf\r
-  LibLocale|StdLib/LibC/Locale/Locale.inf\r
-  LibUefi|StdLib/LibC/Uefi/Uefi.inf\r
-  LibMath|StdLib/LibC/Math/Math.inf\r
-  LibSignal|StdLib/LibC/Signal/Signal.inf\r
-  LibNetUtil|StdLib/LibC/NetUtil/NetUtil.inf\r
-\r
-  # Libraries for device abstractions within the Standard C Library\r
-  # Applications should not directly access any functions defined in these libraries.\r
-  DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf\r
-  DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf\r
-  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf\r
-\r
-[LibraryClasses.IA32]\r
-  TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf\r
-  # To run in an emulation environment, such as Nt32Pkg, comment out the TimerLib\r
-  # description above and un-comment the line below.\r
-#  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
-\r
-[LibraryClasses.X64]\r
-  TimerLib|PerformancePkg/Library/DxeTscTimerLib/DxeTscTimerLib.inf\r
-\r
-[LibraryClasses.IPF]\r
-  PalLib|MdePkg/Library/UefiPalLib/UefiPalLib.inf\r
-  TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf\r
 \r
 ###################################################################################################\r
 #\r
@@ -124,44 +93,27 @@
 ###################################################################################################\r
 \r
 [Components]\r
-# BaseLib and BaseMemoryLib need to be built with the /GL- switch when using the Microsoft\r
-# tool chain.  This is required so that the library functions can be resolved during\r
-# the second pass of the linker during Link-time-code-generation.\r
-###\r
-  MdePkg/Library/BaseLib/BaseLib.inf {\r
-    <BuildOptions>\r
-      MSFT:*_*_*_CC_FLAGS    = /X /Zc:wchar_t /GL-\r
-  }\r
-\r
-  MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf {\r
-    <BuildOptions>\r
-      MSFT:*_*_*_CC_FLAGS    = /X /Zc:wchar_t /GL-\r
-  }\r
 \r
 #### Sample Applications.\r
   AppPkg/Applications/Hello/Hello.inf        # No LibC includes or functions.\r
   AppPkg/Applications/Main/Main.inf          # Simple invocation. No other LibC functions.\r
   AppPkg/Applications/Enquire/Enquire.inf\r
 \r
-# After extracting the Python distribution, un-comment the following line to build Python.\r
+#### After extracting the Python distribution, un-comment the following line to build Python.\r
 #  AppPkg/Applications/Python/PythonCore.inf\r
 \r
-################################################################\r
+\r
+##############################################################################\r
 #\r
-# See the additional comments below if you plan to run applications under the\r
-# Nt32 emulation environment.\r
+# Specify whether we are running in an emulation environment, or not.\r
+# Define EMULATE if we are, else keep the DEFINE commented out.\r
 #\r
+# DEFINE  EMULATE = 1\r
 \r
-[BuildOptions]\r
-  INTEL:*_*_*_CC_FLAGS      = /Qfreestanding\r
-   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t\r
-    GCC:*_*_*_CC_FLAGS      = -ffreestanding -nostdinc -nostdlib\r
-\r
-# The Build Options, below, are only used when building the C library\r
-# to be run under an emulation environment, such as Nt32Pkg.  The clock()\r
-# system call is modified to return -1 indicating that it is unsupported.\r
-# Just uncomment the lines below and select the correct TimerLib instance, above.\r
-\r
-  # INTEL:*_*_IA32_CC_FLAGS     = /D NT32dvm\r
-  #  MSFT:*_*_IA32_CC_FLAGS     = /D NT32dvm\r
-  #   GCC:*_*_IA32_CC_FLAGS     = -DNT32dvm\r
+##############################################################################\r
+#\r
+#  Include Boilerplate text required for building with the Standard Libraries.\r
+#\r
+##############################################################################\r
+!include StdLib/StdLib.inc\r
+!include AppPkg/Applications/Sockets/Sockets.inc\r