From 0da6ca458a3d209784204095f006258709d0cdd6 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 4 Apr 2008 23:39:06 +0000
Subject: [PATCH] edk2/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc:   Add macro
 definitions for ICC toolchain.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4995 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkCompatibilityPkg/EdkCompatibilityPkg.dsc | 55 ++++++++++++++-------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
index c3c4d5a872..5f26625144 100644
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
@@ -41,24 +41,6 @@ define GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S
   0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
 
 [BuildOptions]
-  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)
-  MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32
-  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)
-  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)
-  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)
-
-  MSFT:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)
-  MSFT:*_*_X64_ASM_FLAGS    = /DEFIX64
-  MSFT:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)
-  MSFT:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)
-  MSFT:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)
-
-  MSFT:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)
-  MSFT:*_*_IPF_ASM_FLAGS    =
-  MSFT:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)
-  MSFT:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)
-  MSFT:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)
-
   GCC:*_*_IA32_CC_FLAGS     = -DEFI32 $(GCC_MACRO)
   GCC:*_*_IA32_ASM_FLAGS    = -DEFI32
   GCC:*_*_IA32_VFRPP_FLAGS  = -DEFI32 $(GCC_MACRO)
@@ -78,6 +60,43 @@ define GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S
   GCC:*_*_IPF_PP_FLAGS      = -DEFI64 $(GCC_MACRO)
 
 
+  ICC:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)
+  ICC:*_*_IA32_ASM_FLAGS   = /DEFI32
+  ICC:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)
+  ICC:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)
+  ICC:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)
+
+  ICC:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)
+  ICC:*_*_X64_ASM_FLAGS    = /DEFIX64
+  ICC:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)
+  ICC:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)
+  ICC:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)
+
+  ICC:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)
+  ICC:*_*_IPF_ASM_FLAGS    =
+  ICC:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)
+  ICC:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)
+  ICC:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)
+
+
+  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)
+  MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32
+  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)
+  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)
+  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)
+
+  MSFT:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)
+  MSFT:*_*_X64_ASM_FLAGS    = /DEFIX64
+  MSFT:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)
+  MSFT:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)
+  MSFT:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)
+
+  MSFT:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)
+  MSFT:*_*_IPF_ASM_FLAGS    =
+  MSFT:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)
+  MSFT:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)
+  MSFT:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)
+
 
 [Components.Common]
 
-- 
2.39.2