diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-10 06:51:00 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-10 06:51:00 +0000 |
| commit | ffe084ee76fc408ac3d77e5ce36ba12520d4900a (patch) | |
| tree | 8c123a50d5b3e99640f39140b3b4a7c65d68df15 /BaseTools/Conf | |
| parent | fa3c419fec30282afb85a788cb71e12fd1a51804 (diff) | |
| download | edk2-ffe084ee76fc408ac3d77e5ce36ba12520d4900a.zip edk2-ffe084ee76fc408ac3d77e5ce36ba12520d4900a.tar.gz edk2-ffe084ee76fc408ac3d77e5ce36ba12520d4900a.tar.bz2 | |
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
Diffstat (limited to 'BaseTools/Conf')
| -rw-r--r-- | BaseTools/Conf/build_rule.template | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index c138bd9..d345f2e 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -144,7 +144,7 @@ <Command.MSFT, Command.INTEL>
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
- "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
+ "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
<Command.GCC>
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
@@ -245,21 +245,21 @@ ?.asl, ?.Asl, ?.ASL
<OutputFile>
- $(OUTPUT_DIR)(+)${s_base}.aml
+ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.aml
<ExtraDependency>
$(MAKE_FILE)
<Command.MSFT, Command.INTEL>
- "$(ASLPP)" $(ASLPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_dir}(+)${s_base}.i
- "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_dir}(+)${s_base}.i
+ "$(ASLPP)" $(ASLPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
+ "$(ASL)" -p ${dst} $(ASL_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
[C-Code-File.AcpiTable]
<InputFile>
?.c
<OutputFile>
- $(OUTPUT_DIR)(+)${s_base}.acpi
+ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi
<ExtraDependency>
$(MAKE_FILE)
@@ -274,7 +274,7 @@ ?.aslc, ?.act
<OutputFile>
- $(OUTPUT_DIR)(+)${s_base}.acpi
+ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.acpi
<ExtraDependency>
$(MAKE_FILE)
|