Updated VFR file build command

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 26fb7941d0a7ad69e62a3a1fe4149bd278cc9f5e..44a3196b824d86b6de0cefeaee35519c431e24ae 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -60,7 +60,7 @@ ToolCodeMapping = {
     "Acpi-Source-Language"          :   "ASL",
     "Object"                        :   "SLINK",
     "Static-Library"                :   "DLINK",
     "Acpi-Source-Language"          :   "ASL",
     "Object"                        :   "SLINK",
     "Static-Library"                :   "DLINK",

-               "Dependency-Expression"         :   "PP",
+    "Dependency-Expression"         :   "PP",

 }
 
 ToolChainFamilyMapping = {
 }
 
 ToolChainFamilyMapping = {


@@ -113,11 +113,14 @@ ${END}    "$(APP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fb
        "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.i
 ''',
 
        "$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.i
 ''',
 

-"Visual-Form-Representation" : 
-'$(OUTPUT_DIR)\\%(fdir)s\\%(fbase)s.obj : $(MODULE_DIR)\\%(fdir)s\\%(fname)s $(DEP_FILES)\n'\
-    '\t"$(PP)" $(PP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)\\%(fbase)s.i\n'\
-    '\t"$(VFRC)" $(VFRC_FLAGS) $(INC) $(VFRC_OUTPUT)$(DEBUG_DIR)\\%(fdir)s\\%(fbase)s.c $(@D)\\%(fbase)s.i\n'\
-    '\t"$(CC)" $(CC_FLAGS) $(INC) $(CC_OUTPUT)$@ $(DEBUG_DIR)\\%(fdir)s\\%(fbase)s.c\n',
+"Visual-Form-Representation" : '''\
+$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
+${END}\t"$(VFRPP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
+\tTrim -VFR $(@D)${sep}${fbase}.i
+\t"$(VFRC)" $(VFRC_FLAGS) -od $(DEBUG_DIR)${sep}${fdir} $(@D)${sep}${fbase}.iii
+\t"$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fdir}${sep}${fbase}.c
+''',

 },
 
 "gmake" : {
 },
 
 "gmake" : {