X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=AppPkg%2FAppPkg.dsc;h=60ff05fa4169f0e7268f25cbab65f021c1f9e66a;hp=6e2fa720b556d22ed371915a7339b7c53a8f0263;hb=f6e5cdd5cfa100e777db38e5f7b26b7ffcf41330;hpb=006fecd5a177b4b7b6b36fab6690bf2b2fa11829

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