Fsp1.1 update.

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 8c06a45c475026bb1849d28432133351ba85fd6c..f1edf3a2f4adac9fd2672259b5fc9c84e1481550 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -131,11 +131,33 @@
     <Command.GCC, Command.RVCT>\r
         # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
-        "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
 \r
-    <Command.ARMGCC, Command.ARMLINUXGCC>\r
+    <Command.ARMGCC, Command.ARMLINUXGCC, command.XCODE>\r
         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
 \r
+[C-Code-File.COMMON.IPF]\r
+    <InputFile>\r
+        ?.c\r
+        ?.C\r
+        ?.cc\r
+        ?.CC\r
+        ?.cpp\r
+        ?.Cpp\r
+        ?.CPP\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}\r
+\r
+    <Command.GCC, Command.RVCT>\r
+        # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
+        "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
+        "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
 \r
 [C-Header-File]\r
     <InputFile>\r
@@ -170,6 +192,21 @@
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
         "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
+[Nasm-Assembly-Code-File.COMMON.COMMON]\r
+    <InputFile>\r
+        ?.nasm, ?.Nasm, ?.NASM\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
+\r
 [Assembly-Code-File.COMMON.IPF]\r
     <InputFile>\r
         ?.s\r
@@ -411,7 +448,7 @@
       \r
 [Masm16-Code-File]\r
     <InputFile>\r
-        ?.asm16, ?.Asm16, ?.ASM16\r
+        ?.asm16, ?.Asm16, ?.ASM16, ?.s16, ?.S16\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r