Re: [edk2] [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)

2018-12-17 Thread Feng, Bob C 
Reviewed-by: Bob Feng 

-Original Message-
From: Zhu, Yonghong 
Sent: Friday, December 14, 2018 9:47 AM
To: edk2-devel@lists.01.org
Cc: Fan, ZhijuX ; Gao, Liming ; 
Feng, Bob C 
Subject: [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)

From: zhijufan 

Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii

Cc: Liming Gao 
Cc: Yonghong Zhu 
Cc: Bob Feng 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan 
---
 BaseTools/Conf/build_rule.template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Conf/build_rule.template 
b/BaseTools/Conf/build_rule.template
index 3ab560603f..2a53d7ed63 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -62,6 +62,7 @@
 #   $(BIN_DIR)  Common directory for executable files
 #   $(FV_DIR)   Directory to store flash image files
 #   $(INC)  Search path of current module
+#   $(NASM_INC) Search nasm file path of current module
 #   $(INC_LIST) A file containing search pathes of current module
 #   $(LIBS) Static library files of current module
 #   $(_FLAGS) Tools flags of current module
@@ -225,7 +226,7 @@
 
 "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
 Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii 
${d_path}(+)${s_base}.i
-"$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
+"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst 
+ ${d_path}(+)${s_base}.iii
 
 [Device-Tree-Source-File]
 
--
2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)

2018-12-13 Thread Yonghong Zhu 
From: zhijufan 

Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS)
-o $dst ${d_path}(+)${s_base}.iii

Cc: Liming Gao 
Cc: Yonghong Zhu 
Cc: Bob Feng 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan 
---
 BaseTools/Conf/build_rule.template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Conf/build_rule.template 
b/BaseTools/Conf/build_rule.template
index 3ab560603f..2a53d7ed63 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -62,6 +62,7 @@
 #   $(BIN_DIR)  Common directory for executable files
 #   $(FV_DIR)   Directory to store flash image files
 #   $(INC)  Search path of current module
+#   $(NASM_INC) Search nasm file path of current module
 #   $(INC_LIST) A file containing search pathes of current module
 #   $(LIBS) Static library files of current module
 #   $(_FLAGS) Tools flags of current module
@@ -225,7 +226,7 @@
 
 "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
 Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii 
${d_path}(+)${s_base}.i
-"$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
+"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
 
 [Device-Tree-Source-File]
 
-- 
2.18.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch 2/2] BaseTools: Update nasm file build rule to support $(INC)

2018-10-25 Thread Yonghong Zhu 
From: zhijufan 

Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC)(+) $(NASM_FLAGS)
-o $dst ${d_path}(+)${s_base}.iii

Cc: Liming Gao 
Cc: Yonghong Zhu 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan 
---
 BaseTools/Conf/build_rule.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Conf/build_rule.template 
b/BaseTools/Conf/build_rule.template
index ed54a55..7c4b9e6 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -223,11 +223,11 @@
 $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
 
 "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
 Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii 
${d_path}(+)${s_base}.i
-"$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
+"$(NASM)" -I${s_path}(+) $(NASM_INC)(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
 
 [Device-Tree-Source-File]
 
 ?.dts
 
-- 
2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel