Standardized the command line options of VfrCompile.exe and changed its uses in build...

git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@4740 de2fecce-e211-0410-80a6-f3fac2684e05

diff --git a/edk2/BaseTools/Bin/Win32/VfrCompile.exe b/edk2/BaseTools/Bin/Win32/VfrCompile.exe
index 716bc47..2d8e3c2 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/VfrCompile.exe and b/edk2/BaseTools/Bin/Win32/VfrCompile.exe differ

diff --git a/edk2/BaseTools/Conf/build_rule.template b/edk2/BaseTools/Conf/build_rule.template
index 6aa6a06..0f3a5b3 100644 (file)
--- a/edk2/BaseTools/Conf/build_rule.template
+++ b/edk2/BaseTools/Conf/build_rule.template
@@ -164,7 +164,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 -nopp -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        VfrCompile --no-preprocessing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Object-File]\r
     <InputFile>\r