1. Add ASM source files directory into its Include path.

2. Change the output directory for ASL files to the subdirectory in order to avoid the same file names.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5867 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index c138bd993897c0b68607a4b84a74a9ee1de0994b..d345f2e0c39d02d91c00afc5fe55c72b5696fbb3 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
@@ -245,21 +245,21 @@
         ?.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
-        "$(ASLPP)" $(ASLPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_dir}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_dir}(+)${s_base}.i\r
+        "$(ASLPP)" $(ASLPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
 \r
 [C-Code-File.AcpiTable]\r
     <InputFile>\r
         ?.c\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_base}.acpi\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -274,7 +274,7 @@
         ?.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