Update BuildOption to apply to GCC tool chain family.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4962 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
index 5677c8fa344b7c58a478513533395d279471b36b..69bca2eb03b9e31883683cee35256152541dc91d 100644 (file)
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
@@ -28,7 +28,8 @@
   SUPPORTED_ARCHITECTURES        = IA32|X64|IPF\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
-\r
+define MSFT_MACRO                = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006\r
+define GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_SPECIFICATION_VERSION=0x00010000 -DTIANO_RELEASE_VERSION=0x00080006\r
 \r
 ################################################################################\r
 #\r
@@ -40,16 +41,42 @@
   0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.\r
 \r
 [BuildOptions]\r
-  *_*_*_CC_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_ASM_FLAGS   = \r
-  *_*_*_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_*_*_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_UNIXGCC_*_CC_FLAGS    = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_UNIXGCC_*_ASM_FLAGS   =\r
-  *_UNIXGCC_*_VFRPP_FLAGS = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_UNIXGCC_*_APP_FLAGS   = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 \r
-  *_UNIXGCC_*_PP_FLAGS    = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 \r
+  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32\r
+  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32 $(MSFT_MACRO)\r
+  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32 $(MSFT_MACRO)\r
+\r
+  MSFT:*_*_X64_CC_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_ASM_FLAGS    = /DEFIX64\r
+  MSFT:*_*_X64_VFRPP_FLAGS  = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_APP_FLAGS    = /D EFIX64 $(MSFT_MACRO)\r
+  MSFT:*_*_X64_PP_FLAGS     = /D EFIX64 $(MSFT_MACRO)\r
+\r
+  MSFT:*_*_IPF_CC_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_ASM_FLAGS    = /DEFI64\r
+  MSFT:*_*_IPF_VFRPP_FLAGS  = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_APP_FLAGS    = /D EFI64 $(MSFT_MACRO)\r
+  MSFT:*_*_IPF_PP_FLAGS     = /D EFI64 $(MSFT_MACRO)\r
+\r
+  GCC:*_*_IA32_CC_FLAGS     = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_ASM_FLAGS    = -DEFI32\r
+  GCC:*_*_IA32_VFRPP_FLAGS  = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_APP_FLAGS    = -DEFI32 $(GCC_MACRO)\r
+  GCC:*_*_IA32_PP_FLAGS     = -DEFI32 $(GCC_MACRO)\r
+\r
+  GCC:*_*_X64_CC_FLAGS      = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_ASM_FLAGS     = -DEFIX64\r
+  GCC:*_*_X64_VFRPP_FLAGS   = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_APP_FLAGS     = -DEFIX64 $(GCC_MACRO)\r
+  GCC:*_*_X64_PP_FLAGS      = -DEFIX64 $(GCC_MACRO)\r
+\r
+  GCC:*_*_IPF_CC_FLAGS      = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_ASM_FLAGS     = -DEFI64\r
+  GCC:*_*_IPF_VFRPP_FLAGS   = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_APP_FLAGS     = -DEFI64 $(GCC_MACRO)\r
+  GCC:*_*_IPF_PP_FLAGS      = -DEFI64 $(GCC_MACRO)\r
+\r
 \r
 \r
 [Components.Common]\r