StdLib: Add multi-byte character support. The normal "narrow" character set is now...

[mirror_edk2.git] / StdLib / StdLib.inc

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index fa1865659ba80d36fa80c98cdc5a820c48873d29..3dc7e9e38f4a467df86232fc73bdb0f71e3fad83 100644 (file)
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -5,7 +5,7 @@
 # The including DSC file must DEFINE the EMULATE macro if\r
 # the application is to be run in an emulation environment.\r
 #\r
-#  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
@@ -25,6 +25,12 @@
   UseSocketDxe|StdLib/UseSocketDxe/UseSocketDxe.inf\r
 \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
+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
+\r
   #\r
   # C Standard Libraries\r
   #\r
@@ -90,19 +96,19 @@
 !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\r
-   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t\r
-    GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib\r
-    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
-  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\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
 \r
 !else\r
   # The Build Options, below, are only used when building the Standard Libraries\r
   # to be run under an emulation environment.\r
   # They disable optimization which facillitates debugging under the Emulation environment.\r
-  INTEL:*_*_IA32_CC_FLAGS     = /Od\r
-   MSFT:*_*_IA32_CC_FLAGS     = /Od\r
-    GCC:*_*_IA32_CC_FLAGS     = -O0\r
-    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm\r
-  ARMGCC:*_*_*_CC_FLAGS      = -O0 -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
+  INTEL:*_*_IA32_CC_FLAGS     = /Od /D UEFI_C_SOURCE\r
+   MSFT:*_*_IA32_CC_FLAGS     = /Od /D UEFI_C_SOURCE\r
+    GCC:*_*_IA32_CC_FLAGS     = -O0 -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      = -O0 -DUEFI_C_SOURCE -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length\r
 !endif\r