InOsEmuPkg: Remove unneeded Framework for XCODE linker flag overrides.

[mirror_edk2.git] / InOsEmuPkg / Unix / UnixX64.dsc

diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/InOsEmuPkg/Unix/UnixX64.dsc
index 10bb0cf2f6e717f216a8b5fe20e6d782b5eaa36e..42afc4d4305e483df65a5bffa0468cafd71d0a88 100644 (file)
--- a/InOsEmuPkg/Unix/UnixX64.dsc
+++ b/InOsEmuPkg/Unix/UnixX64.dsc
@@ -1,6 +1,6 @@
 ## @file\r
 #\r
-# EFI/Framework Emulation Platform with UEFI HII interface supported.\r
+# UEFI/PI Emulation Platform with UEFI HII interface supported.\r
 #\r
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 #       a real platform. This also provides an example for how an DSC is created.\r
@@ -27,8 +27,13 @@
   PLATFORM_GUID                  = 05FD064D-1073-E844-936C-A0E16317107D\r
   PLATFORM_VERSION               = 0.3\r
   DSC_ SPECIFICATION             = 0x00010005\r
+!if $(BUILD_32)\r
+  OUTPUT_DIRECTORY               = Build/EmuUnixIa32\r
+!else\r
   OUTPUT_DIRECTORY               = Build/EmuUnixX64\r
-  SUPPORTED_ARCHITECTURES        = X64\r
+!endif\r
+\r
+  SUPPORTED_ARCHITECTURES        = X64|IA32\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = InOsEmuPkg/Unix/UnixX64.fdf\r
@@ -216,6 +221,7 @@
   \r
   gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"1"\r
 \r
+  # For a CD-ROM/DVD use L"diag.dmg:RO:2048"\r
   gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"\r
   gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"\r
   gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin"\r
@@ -263,10 +269,21 @@
 #       generated for it, but the binary will not be put into any firmware volume.\r
 #\r
 ###################################################################################################\r
+\r
+[Components.X64]\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
+    <LibraryClasses>\r
+      # turn off CR3 write so that DXE IPL will not crash emulator\r
+      BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf\r
+  }\r
+\r
+[Components.IA32]\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf \r
+\r
 [Components]\r
 !if $(SEC_ONLY)\r
   ##\r
-  #  SEC Phase modules\r
+  #  Emulator, OS POSIX application\r
   ##\r
   InOsEmuPkg/Unix/Sec/SecMain.inf\r
 !else\r
@@ -293,11 +310,6 @@
   InOsEmuPkg/FirmwareVolumePei/FirmwareVolumePei.inf\r
   InOsEmuPkg/FlashMapPei/FlashMapPei.inf\r
   InOsEmuPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
-    <LibraryClasses>\r
-      # turn off CR3 write so that DXE IPL will not crash emulator\r
-      BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf\r
-  }\r
 \r
   ##\r
   #  DXE Phase modules\r
@@ -349,10 +361,10 @@
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf \r
- # {\r
- #   <LibraryClasses>  \r
- #     NULL|InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf\r
- # }\r
+  #{\r
+  #  <LibraryClasses>  \r
+  #    NULL|InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf\r
+  #}\r
   \r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
@@ -413,6 +425,9 @@
       ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
       SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf\r
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
+#      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf\r
+#      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf\r
+\r
     <PcdsFixedAtBuild>\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF\r
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r