update default and comment to resolve confusion

[mirror_edk2.git] / EdkShellPkg / EdkShellPkg.dsc

diff --git a/EdkShellPkg/EdkShellPkg.dsc b/EdkShellPkg/EdkShellPkg.dsc
index 0c90d9ff17368417f141eb4fb0b7bb8555c29e6d..6a2335aaa288d959d5e6c2254bfe458fd23407b0 100644 (file)
--- a/EdkShellPkg/EdkShellPkg.dsc
+++ b/EdkShellPkg/EdkShellPkg.dsc
@@ -25,9 +25,10 @@
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 # \r
-# Change the macro to the directory containing the source code from EDK Shell Project.\r
+# Change the macro to the directory containing the source code from EDK Shell Project.  \r
+# This is a workspace relative directory\r
 #  \r
-DEFINE EDK_SHELL_DIR             = Shell\r
+DEFINE EDK_SHELL_DIR             = EdkShellPkg/Shell\r
 \r
 [Libraries]\r
   #\r
@@ -39,7 +40,6 @@ DEFINE EDK_SHELL_DIR             = Shell
   EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf\r
   EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf\r
   EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIA64Lib/CpuIA64Lib.inf\r
-  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf\r
   EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf\r
   EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf\r
   #\r
@@ -74,11 +74,10 @@ DEFINE EDK_SHELL_DIR             = Shell
   #\r
   $(EDK_SHELL_DIR)/Library/EfiShellLib.inf\r
 \r
+[Libraries.IA32, Libraries.X64]\r
+  EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf\r
 \r
 [Components]\r
-  #\r
-  # Shell.inf & ShellFull.inf can not be included at once to avoid over\r
-  #\r
   $(EDK_SHELL_DIR)/Shell.inf\r
   $(EDK_SHELL_DIR)/ShellFull.inf\r
   $(EDK_SHELL_DIR)/attrib/attrib.inf\r