enhanced function header

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 385f0202708d2f80839f0b295050d8ffd78b8241..4f68ddc6c173e2ca35241100d7736ad9dd09cfb4 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -144,7 +144,7 @@
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
     <Command.GCC>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
@@ -179,7 +179,7 @@
         $(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c\r
 \r
     <Command>\r
-        "$(PP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        "$(VFRPP)" $(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
         "$(VFR)" $(VFR_FLAGS) --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
@@ -245,28 +245,44 @@
         ?.asl, ?.Asl, ?.ASL\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_base}.aml\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.aml\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
+        Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}\r
+        "$(ASLPP)" $(ASLPP_FLAGS) $(INC) /I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
+\r
+[C-Code-File.AcpiTable]\r
+    <InputFile>\r
+        ?.c\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+        "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Acpi-Table-Code-File]\r
     <InputFile>\r
-        ?.aslc\r
+        ?.aslc, ?.act\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_base}.acpi\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}\r
-        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+        "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Masm16-Code-File]\r
@@ -286,7 +302,7 @@
 \r
 [Microcode-File]\r
     <InputFile>\r
-        ?.txt, ?.TXT, ?.Txt\r
+        ?.txt, ?.TXT, ?.Txt, ?.mut\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_base}.mcb\r
@@ -305,21 +321,20 @@
         GenFw -o ${dst} -j ${src}\r
         -$(CP) ${dst} $(BIN_DIR)\r
 \r
-[Unicode-Text-File]\r
+[EFI-Image-File]\r
     <InputFile>\r
-        *.uni, *.Uni, *.UNI\r
+        ?.efi, ?.Efi, ?.EFI\r
 \r
     <OutputFile>\r
-        $(DEBUG_DIR)(+)AutoGen.c\r
-        $(DEBUG_DIR)(+)AutoGen.h\r
 \r
     <Command>\r
 \r
-[EFI-Image-File]\r
+[Unicode-Text-File]\r
     <InputFile>\r
-        ?.efi, ?.Efi, ?.EFI\r
+        *.uni, *.Uni, *.UNI\r
 \r
     <OutputFile>\r
+        $(DEBUG_DIR)(+)AutoGen.c\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)StrDefs.h\r
 \r
     <Command>\r
-\r