StdLib: Remove EfiSocketLib and Ip4Config Protocol dependency.

[mirror_edk2.git] / StdLib / StdLib.inc

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index cb54be1548c8a958ff45c05594e427047d0599b0..1b7fcf0bae31acf3f8a550f4e1fa17de53469b4d 100644 (file)
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -26,9 +26,8 @@
 \r
 [LibraryClasses.Common.UEFI_APPLICATION]\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
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
 \r
   #\r
@@ -69,6 +68,8 @@
   DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf\r
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf\r
 \r
+  LuaLib|AppPkg/Applications/Lua/LuaLib.inf           # Lua language library\r
+\r
 [LibraryClasses.ARM]\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
@@ -103,19 +104,9 @@
 #\r
 \r
 [BuildOptions]\r
-!ifndef $(EMULATE)\r
-  # These Build Options are used when building the Standard Libraries to be run\r
-  # on real hardware.\r
-   INTEL:*_*_*_CC_FLAGS     = /Qfreestanding /D UEFI_C_SOURCE\r
-    MSFT:*_*_*_CC_FLAGS     = /X /Zc:wchar_t /D UEFI_C_SOURCE\r
-     GCC:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE\r
-    RVCT:*_*_*_CC_FLAGS     = --library_interface=none -DUEFI_C_SOURCE -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
-  ARMGCC:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
-   XCODE:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized\r
-\r
-!else\r
+!ifdef $(EMULATE)\r
   # The Build Options, below, are only used when building the Standard Libraries\r
-  # to be run under an emulation environment.\r
+  # to be run under an emulation environment; such as NT32Pkg.\r
   # They disable optimization which facillitates debugging under the Emulation environment.\r
   INTEL:*_*_IA32_CC_FLAGS   = /Od /D UEFI_C_SOURCE\r
    MSFT:*_*_IA32_CC_FLAGS   = /Od /D UEFI_C_SOURCE\r
@@ -123,4 +114,14 @@
     RVCT:*_*_*_CC_FLAGS     = --library_interface=none -DUEFI_C_SOURCE -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
   ARMGCC:*_*_*_CC_FLAGS     = -O0 -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
    XCODE:*_*_*_CC_FLAGS     = -O0 -DUEFI_C_SOURCE -Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized\r
+\r
+!else\r
+  # These Build Options are used when building the Standard Libraries to be run\r
+  # on real hardware.\r
+   INTEL:*_*_*_CC_FLAGS     = /Qfreestanding /D UEFI_C_SOURCE\r
+    MSFT:*_*_*_CC_FLAGS     = /X /Zc:wchar_t /D UEFI_C_SOURCE\r
+     GCC:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE\r
+    RVCT:*_*_*_CC_FLAGS     = --library_interface=none -DUEFI_C_SOURCE -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
+  ARMGCC:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
+   XCODE:*_*_*_CC_FLAGS     = -nostdinc -nostdlib -DUEFI_C_SOURCE -Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized\r
 !endif\r