Update BuildMacro to support LIBPATH and INCLUDEPATH.

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

1 files changed, 27 insertions, 12 deletions

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0eb9c5742c..8e7ef78025 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -51,7 +51,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <!-- Generate pre-compiled header -->

               <cc userdefine="on">

                 <command type="CC" cmd="${PCH}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"

-                  outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj">

+                    outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj" dpath="${CC_DPATH}" libpath="${CC_LIBPATH}" 

+                    include="${CC_INCLUDEPATH}">

                   <EXTRA.INC/>

                   <argument value="${PCH_FLAGS}"/>

                   <EXTRA.ARG/>

@@ -123,7 +124,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"

-              outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">

+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}" 

+                libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">

               <EXTRA.INC/>

               <argument value="${CC_FLAGS}"/>

               <EXTRA.ARG/>

@@ -181,7 +183,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"

-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">

+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}"

+                libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">

               <EXTRA.INC/>

               <argument value="${CC_FLAGS}"/>

               <EXTRA.ARG/>

@@ -228,7 +231,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}"

-                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i" dpath="${CC_DPATH}">

+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i" dpath="${CC_DPATH}"

+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}">

               <EXTRA.INC/>

               <argument value="${PP_FLAGS}"/>

               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

@@ -310,7 +314,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

         <sequential>

           <cc userdefine="on">

-            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" dpath="${PP_DPATH}">

+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" 

+                dpath="${PP_DPATH}" libpath="${PP_LIBPATH}" include="${PP_INCLUDEPATH}">

               <EXTRA.INC.1/>

               <argument value="${PP_FLAGS}"/>

               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

@@ -333,7 +338,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

           <cc userdefine="on">

             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"

-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}">

+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}"

+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">

               <EXTRA.INC.1/>

       

               <argument value="${ASM_FLAGS}"/>

@@ -384,7 +390,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"

-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}">

+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}"

+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">

               <EXTRA.INC.1/>

       

               <argument value="${ASM_FLAGS}"/>

@@ -443,7 +450,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

         <sequential>

           <cc userdefine="on">

-            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}" dpath="${APP_DPATH}">

+            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}" 

+                dpath="${APP_DPATH}" libpath="${APP_LIBPATH}" include="${APP_INCLUDEPATH}">

               <EXTRA.INC.1/>

               <argument value="${APP_FLAGS}"/>

               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

@@ -453,6 +461,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <cc userdefine="on">

             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"

                 includepathDelimiter="-I" outputDelimiter="-o" dpath="${ASM_DPATH}"

+                libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}"

                 outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">

               <EXTRA.INC.1/>

               <argument value="${ASM_FLAGS}"/>

@@ -488,7 +497,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>

   

       <cc userdefine="on">

-        <command type="ASM" includepathDelimiter="-I" dpath="${ASM_DPATH}">

+        <command type="ASM" includepathDelimiter="-I" dpath="${ASM_DPATH}"

+             libpath="${ASM_LIBPATH}" include="${ASM_INCLUDEPATH}">

           <includepath path="${WORKSPACE_DIR}"/>

           <includepath path="${MODULE_DIR}"/>

           <includepath path="${MODULE_DIR}/${ARCH}"/>

@@ -528,7 +538,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"

-                outputFile="${BIN_DIR}/@{FILENAME}.lib" dpath="${SLINK_DPATH}">

+                outputFile="${BIN_DIR}/@{FILENAME}.lib" dpath="${SLINK_DPATH}"

+                libpath="${SLINK_LIBPATH}" include="${SLINK_INCLUDEPATH}">

               <argument value="${SLINK_FLAGS}"/>

 

               <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>

@@ -640,6 +651,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <cc userdefine="on">

             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"

                      includepathDelimiter="-I" dpath="${CC_DPATH}"

+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}"

                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj">

               <argument value="${CC_FLAGS}"/>

               <EXTRA.INC />

@@ -703,6 +715,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <cc userdefine="on">

             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" 

                      includepathDelimiter="-I" family="${CC_FAMILY}" dpath="${CC_DPATH}"

+                     libpath="${CC_LIBPATH}" include="${CC_INCLUDEPATH}"

                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >

               <argument value="${CC_FLAGS}"/>

               <EXTRA.INC/>

@@ -770,7 +783,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>

           <cc userdefine="on">

             <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}" dpath="${SLINK_DPATH}"

-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">

+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib"

+                libpath="${SLINKLIBPATH}" include="${SLINK_INCLUDEPATH}">

               <argument value="${SLINK_FLAGS}"/>

 

               <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>

@@ -778,7 +792,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </cc>

           <cc userdefine="on">

             <command type="DLINK" cmd="${DLINK}" family="${DLINK_FAMILY}"

-                     outputFile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll" dpath="${DLINK_DPATH}" >

+                     outputFile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll" dpath="${DLINK_DPATH}" 

+                     libpath="${DLINK_LIBPATH}" include="${DLINK_INCLUDEPATH}">

               <argument value="${DLINK_FLAGS}"/>

               <libset libs="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib ${LIBS} ${DLINK_SPATH}"/>

               <LINK.ARG/>