From 8fc4fc3a0e3d10c2093bcdef89cc408980c44f22 Mon Sep 17 00:00:00 2001 From: jwang36 Date: Mon, 25 Jun 2007 17:00:40 +0000 Subject: 1) Incorporated generating top level makefile. Now platform build is possible (no FD generation). 2) Added GenFw.exe for EFI file generation 3) Changed the destination directory of *.template file to WORKSPACE/Conf 4) Commented out several modules in the MdePkg.dsc file since they cannot be found in the MdePkg package directory. 5) Removed the usage of WORKSPACE_DIR macro in makefile. WORKSPACE is used instead all the way. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2733 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Conf/build_rule.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'BaseTools/Conf/build_rule.template') diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 3fede25e64..db459d988b 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -92,24 +92,24 @@ ToolChainFamilyMapping = { Makefile = { "nmake" : { "C-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname} ''', "AutoGen-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} +${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} ${END} "$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname} ''', "Masm-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} ${END} "$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i Trim -CONVERT $(@D)${sep}${fbase}.i "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii ''', "Iasm-Code" : '''\ -${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep} +${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep} ${END} "$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i "$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i ''', -- cgit v1.2.3