diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-26 01:54:49 +0000 |
| commit | 3e99020dbf0a159e34b84e7ae9125f2e368d5390 (patch) | |
| tree | 0eb6339318f7bf7da1b679b8009cf267b2234566 /EdkCompatibilityPkg/Sample/CommonTools.env | |
| parent | 68bb5ce77e51cf35791e46f2202e36da97e5e6be (diff) | |
| download | edk2-platforms-3e99020dbf0a159e34b84e7ae9125f2e368d5390.tar.xz | |
Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg/Sample/CommonTools.env')
| -rw-r--r-- | EdkCompatibilityPkg/Sample/CommonTools.env | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/EdkCompatibilityPkg/Sample/CommonTools.env b/EdkCompatibilityPkg/Sample/CommonTools.env index cd7d4c2ea7..567e746c83 100644 --- a/EdkCompatibilityPkg/Sample/CommonTools.env +++ b/EdkCompatibilityPkg/Sample/CommonTools.env @@ -1,6 +1,6 @@ #/*++
#
-# Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -83,6 +83,7 @@ GENFVIMAGE = $(EDK_TOOLS_OUTPUT)\GenFvImage GENSECTION = $(EDK_TOOLS_OUTPUT)\GenSection
GENTEIMAGE = $(EDK_TOOLS_OUTPUT)\GenTEImage
GUIDCHK = $(EDK_TOOLS_OUTPUT)\GuidChk
+HIIPACK = $(EDK_TOOLS_OUTPUT)\HiiPack
MAKEDEPS = $(EDK_TOOLS_OUTPUT)\MakeDeps
PROCESSDSC = $(EDK_TOOLS_OUTPUT)\ProcessDsc
STRGATHER = $(EDK_TOOLS_OUTPUT)\StrGather
@@ -188,6 +189,7 @@ ASMLINK = $(EDK_TOOLS_BIN)\Ia32\$(EFI_ASSEMBLER_NAME)\binr\link !ENDIF
BSCMAKE = bscmake
+RC = rc
!IF "$(EFI_SYMBOLIC_DEBUG)" == "YES"
ASM_ARCH_FLAGS = $(ASM_ARCH_FLAGS) /Zi /DDEBUG
@@ -274,6 +276,7 @@ ASMLINK = $(EDK_TOOLS_BIN)\Ia32\$(EFI_ASSEMBLER_NAME)\binr\link !ENDIF
BSCMAKE = bscmake
+RC = rc
!IF "$(EFI_SYMBOLIC_DEBUG)" == "YES"
ASM_ARCH_FLAGS = $(ASM_ARCH_FLAGS) /Zi /DDEBUG
@@ -381,6 +384,7 @@ ASMLINK = $(EDK_TOOLS_BIN)\Ipf\$(EFI_ASSEMBLER_NAME)\link !ENDIF
BSCMAKE = bscmake
+RC = rc
!IF "$(EFI_SYMBOLIC_DEBUG)" == "YES"
C_STD_FLAGS = $(C_STD_FLAGS) /Zi /Gm /Fd$(DEST_DIR)\$(BASE_NAME)Obj
@@ -531,8 +535,10 @@ EBC_CC = $(EBC_TOOLS_PATH)\Bin\Iec EBC_LINK = $(EBC_TOOLS_PATH)\Bin\Link
EBC_LIB = $(EBC_TOOLS_PATH)\Bin\Link /lib
+RC = rc
+
!IF "$(EFI_SYMBOLIC_DEBUG)" == "YES"
-EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /Zd /Zi
+EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) /Zi
EBC_LINK_STD_FLAGS = $(EBC_LINK_STD_FLAGS) /DEBUG
!ENDIF
@@ -579,6 +585,15 @@ VFRCOMPILE_FLAGS = $(VFRCOMPILE_FLAGS) -ppflag "$(VERSION_FLAGS)" ASM_STD_FLAGS = $(ASM_STD_FLAGS) $(VERSION_FLAGS)
!ENDIF
+!IF "$(TOOLCHAIN)" != "TOOLCHAIN_MSVC"
+BUILD_STRING_FLAGS = /D EFI_BUILD_VERSION="L\"$(EDK_BUILD_VERSION)\"" /D EFI_FIRMWARE_VENDOR="L\"TianoCore.org\""
+!ELSE
+BUILD_STRING_FLAGS = /D UTILITY_BUILD="\"$(EDK_BUILD_VERSION)\"" /D UTILITY_VENDOR="\"TianoCore.org\""
+!ENDIF
+
+C_STD_FLAGS = $(C_STD_FLAGS) $(BUILD_STRING_FLAGS)
+EBC_C_STD_FLAGS = $(EBC_C_STD_FLAGS) $(BUILD_STRING_FLAGS)
+
!IF "$(EFI_DEBUG)" == "YES"
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_DEBUG
!ENDIF
@@ -611,6 +626,10 @@ FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_DXE_PERFORMANCE FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_S3_RESUME
!ENDIF
+!IF "$(EFI_NO_CSM_SUPPORT)" == "YES"
+FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_NO_CSM_SUPPORT
+!ENDIF
+
!IF "$(EFI_SIZE_REDUCTION_APPLIED)" == "YES"
FEATURE_FLAGS = $(FEATURE_FLAGS) /D EFI_SIZE_REDUCTION_APPLIED
!ENDIF
|