Integrate patch from Andrew Fish to make it run on OS X.

[mirror_edk2.git] / UnixPkg / Sec / SecMain.inf

diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index f3c00e8b0677f1a9c899a072a67eb7171fea979f..c7a9b40df7b16b2dd0d001a190229e762d0f9a9d 100644 (file)
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -2,7 +2,8 @@
 # Entry Point of Unix Emulator\r
 #\r
 # Main executable file of Unix Emulator that loads PEI core after initialization finished.\r
-# Copyright (c) 2008, Intel Corporation\r
+# Copyright (c) 2008 - 2009, Intel Corporation\r
+# Portions copyright (c) 2008-2009 Apple Inc.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -35,7 +36,10 @@
   UnixThunk.c\r
   FwVol.c\r
   SecMain.c\r
-  Stack.S\r
+  \r
+[Sources.Ia32]  \r
+  Ia32/Gasket.S\r
+  Ia32/Stack.S\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -53,10 +57,6 @@
   ReportStatusCodeLib\r
 \r
 \r
-[Guids]\r
-  gEfiPeiPeCoffLoaderGuid                       # ALWAYS_PRODUCED\r
-\r
-\r
 [Ppis]\r
   gUnixPeiLoadFilePpiGuid                       # PPI ALWAYS_PRODUCED\r
   gEfiPeiStatusCodePpiGuid                      # PPI ALWAYS_PRODUCED\r
@@ -73,8 +73,15 @@
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize\r
 \r
 [BuildOptions.common]\r
-   GCC:*_*_IA32_DLINK_FLAGS = -o $(BIN_DIR)/SecMain.exe -m elf_i386 -dynamic-linker /lib/ld-linux.so.2 /usr/lib/crt1.o /usr/lib/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib/crtn.o\r
-   GCC:*_*_*_DLINK2_FLAGS = -lc\r
-   GCC:*_*_IA32_CC_FLAGS = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
-   GCC:*_*_IA32_PP_FLAGS = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-   GCC:*_*_IA32_ASM_FLAGS = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+   GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -m elf_i386 -dynamic-linker /lib/ld-linux.so.2 /usr/lib/crt1.o /usr/lib/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib/crtn.o\r
+   GCC:*_*_*_DLINK2_FLAGS == -lc\r
+   GCC:*_*_IA32_CC_FLAGS == -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
+   GCC:*_*_IA32_PP_FLAGS == -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+   GCC:*_*_IA32_ASM_FLAGS == -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+\r
+#\r
+# Need to do this link via gcc and not ld as the pathing to libraries changes from OS version to OS version\r
+#\r
+   XCODE:*_*_IA32_DLINK_PATH == gcc\r
+   XCODE:*_*_IA32_DLINK_FLAGS == -arch i386  -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon           \r
+   XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g\r