Abstract VFR compiler and Flag to marco that user can customize.

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index bf667d208d0407496784ab6a8d819bd7aa4a1669..c6cde8f2e5a4ff27204fd7806a21afb738759f54 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -169,7 +169,7 @@
         "$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         Trim --vfr-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         -mkdir ${d_path} > NUL 2>&1\r
-        VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(VFR)" $(VFR_FLAGS) --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Object-File]\r
     <InputFile>\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index a8413ee58b32d296dab36429de075b72c67b032a..9318e3f4be9e3523a8b689027b46ee0ddecfaa84 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -763,3 +763,8 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 \r
+##################\r
+# VfrCompiler definitions\r
+##################\r
+*_*_*_VFR_PATH                      = VfrCompile.exe\r
+*_*_*_VFR_FLAGS                     = -l -n\r