Added "-nopp" to VfrCompile.exe tool to bypass the preprocessing on input file

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 5c22a0badd6082aa5f0a1ff4765997261075e304..6aa6a06941bd40edc9125efb87f4aed3837c0d93 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -78,7 +78,7 @@
 \r
 ## Reserved File-Type\r
 #\r
-# Dont't change following names of file types and their associated files,\r
+# Don't change following names of file types and their associated files,\r
 # which are also used in tools' code\r
 #\r
 #   C-Code-File\r
@@ -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 -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        VfrCompile -nopp -od ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Object-File]\r
     <InputFile>\r
@@ -197,10 +197,15 @@
 #        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)\r
 #\r
 [Build.Static-Library-File]\r
-    <InputFile>\r
+    <InputFile.MSFT, InputFile.Intel>\r
+        ?.lib\r
+        $(LIBS)\r
+        $(MAKE_FILE)\r
+\r
+    <InputFile.GCC>\r
         ?.lib\r
         $(LIBS)\r
-        $(MODULE_BUILD_DIR)\Makefile\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
@@ -209,7 +214,7 @@
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)\r
 \r
 [Build.Dynamic-Library-File]\r
     <InputFile>\r
@@ -232,7 +237,9 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex\r
 \r
     <Command>\r
-#       GenDepex -o ${dst} ${src}\r
+        "$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Acpi-Source-Language-File]\r
     <InputFile>\r
@@ -243,7 +250,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r