X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FSec%2FSecMain.inf;h=c7a9b40df7b16b2dd0d001a190229e762d0f9a9d;hb=ccd55824e79865a04b1c872bda4af0f1de1f50be;hp=f3c00e8b0677f1a9c899a072a67eb7171fea979f;hpb=73aa7f049bcc615f1a09dae29ec9a89cacd27420;p=mirror_edk2.git

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