From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 18 Jul 2007 02:58:49 +0000 (+0000)
Subject: Added $(INC) for MASM
X-Git-Tag: edk2-stable201903~22655
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=1972a51c6c0c50f8b4970e3dc9c21ecb0b4c901d;ds=sidebyside

Added $(INC) for MASM

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 9fdd04bac8..abba0b704c 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -95,7 +95,7 @@ Makefile = {
 "C-Code"    : '''\
 $(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
 ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
-${END}	"$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(WORKSPACE)${sep}${fpath}
+${END}	"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath}
 ''',
 
 "Masm-Code" : '''\
@@ -103,14 +103,14 @@ $(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
 ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
 ${END}	"$(PP)" $(PP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
 	Trim -CONVERT $(@D)${sep}${fbase}.i
-	"$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii
+	"$(ASM)" /Fo$@ $(ASM_FLAGS) $(INC) $(@D)${sep}${fbase}.iii
 ''',
 
 "Iasm-Code" : '''\
 $(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
 ${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
 ${END}	"$(APP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
-	"$(ASM)" $(ASM_FLAGS) -o$@ $(@D)${sep}${fbase}.i
+	"$(ASM)" -o$@ $(ASM_FLAGS) $(@D)${sep}${fbase}.i
 ''',
 
 "Visual-Form-Representation" : '''\
@@ -120,7 +120,7 @@ ${END}\t"$(PP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${
 \tTrim -VFR $(@D)${sep}${fbase}.i
 \t-mkdir $(DEBUG_DIR)${sep}${fdir} > NUL 2>&1
 \tVfrCompile -od $(DEBUG_DIR)${sep}${fdir} $(@D)${sep}${fbase}.iii
-\t"$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fdir}${sep}${fbase}.c
+\t"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(DEBUG_DIR)${sep}${fdir}${sep}${fbase}.c
 ''',
 },