From 7794baccd12bb8f40bdc9c4af92c380026a31068 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Fri, 28 Mar 2008 11:50:37 +0000 Subject: [PATCH] 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 --- EdkCompatibilityPkg/EdkCompatibilityPkg.dsc | 49 ++++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc index 5677c8fa34..69bca2eb03 100644 --- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc +++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc @@ -28,7 +28,8 @@ SUPPORTED_ARCHITECTURES = IA32|X64|IPF BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - +define MSFT_MACRO = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 +define GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_SPECIFICATION_VERSION=0x00010000 -DTIANO_RELEASE_VERSION=0x00080006 ################################################################################ # @@ -40,16 +41,42 @@ 0|DEFAULT # The entry: 0|DEFAULT is reserved and always required. [BuildOptions] - *_*_*_CC_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 - *_*_*_ASM_FLAGS = - *_*_*_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 - *_*_*_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 - *_*_*_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 - *_UNIXGCC_*_CC_FLAGS = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 - *_UNIXGCC_*_ASM_FLAGS = - *_UNIXGCC_*_VFRPP_FLAGS = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 - *_UNIXGCC_*_APP_FLAGS = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 - *_UNIXGCC_*_PP_FLAGS = -D EFI_SPECIFICATION_VERSION=0x0002000A -D PI_SPECIFICATION_VERSION=0x00010000 -D TIANO_RELEASE_VERSION=0x00080006 + 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 = /DEFI64 + 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) + GCC:*_*_IA32_APP_FLAGS = -DEFI32 $(GCC_MACRO) + GCC:*_*_IA32_PP_FLAGS = -DEFI32 $(GCC_MACRO) + + GCC:*_*_X64_CC_FLAGS = -DEFIX64 $(GCC_MACRO) + GCC:*_*_X64_ASM_FLAGS = -DEFIX64 + GCC:*_*_X64_VFRPP_FLAGS = -DEFIX64 $(GCC_MACRO) + GCC:*_*_X64_APP_FLAGS = -DEFIX64 $(GCC_MACRO) + GCC:*_*_X64_PP_FLAGS = -DEFIX64 $(GCC_MACRO) + + GCC:*_*_IPF_CC_FLAGS = -DEFI64 $(GCC_MACRO) + GCC:*_*_IPF_ASM_FLAGS = -DEFI64 + GCC:*_*_IPF_VFRPP_FLAGS = -DEFI64 $(GCC_MACRO) + GCC:*_*_IPF_APP_FLAGS = -DEFI64 $(GCC_MACRO) + GCC:*_*_IPF_PP_FLAGS = -DEFI64 $(GCC_MACRO) + [Components.Common]