X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FConf%2Fbuild_rule.template;h=8808afff281283656ae797c2a85ce96f779f3a54;hp=19ed2a8f412f5b4bcffddc7205f94d39c71bc3b1;hb=d78f8ac7eee82794f2663cbfa38c8911df05e3a0;hpb=c8c6d794df25bfabc28c3624bd5c442c542b6234

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 19ed2a8f41..8808afff28 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -78,7 +78,7 @@
 
 ## Reserved File-Type
 #
-# Dont't change following names of file types and their associated files,
+# Don't change following names of file types and their associated files,
 # which are also used in tools' code
 #
 #   C-Code-File
@@ -197,10 +197,15 @@
 #        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)
 #
 [Build.Static-Library-File]
-    <InputFile>
+    <InputFile.MSFT, InputFile.Intel>
+        ?.lib
+        $(LIBS)
+        $(MAKE_FILE)
+
+    <InputFile.GCC>
         ?.lib
         $(LIBS)
-        $(MODULE_BUILD_DIR)\Makefile
+        $(MAKE_FILE)
 
     <OutputFile>
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll
@@ -209,7 +214,7 @@
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}
 
     <Command.GCC>
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)
 
 [Build.Dynamic-Library-File]
     <InputFile>
@@ -232,7 +237,9 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex
 
     <Command>
-#       GenDepex -o ${dst} ${src}
+        "$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
+        Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
+        GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
 
 [Build.Acpi-Source-Language-File]
     <InputFile>
@@ -262,13 +269,12 @@
         ?.asm16, ?.Asm16, ?.ASM16
 
     <OutputFile>
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.com
+        $(OUTPUT_DIR)(+)${s_base}.com
 
     <Command.MSFT, Command.INTEL>
-        pushd .
         cd $(OUTPUT_DIR)(+)${s_dir}
-        "$(ASM)" /nologo /omf ${src} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)
-        -$(CP) ${dst} $(OUTPUT_DIR) & popd
+        "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}
+        "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,
 
 [Build.Microcode-File]
     <InputFile>