A couple of cleanups in the TianoTools build.

[mirror_edk2.git] / Tools / Source / TianoTools / GenCapsuleHdr / build.xml

diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
index 88623078ce72cf2e8683ebd7f5c40e3f37a45ff4..a322c8e6b28ebfda3f05fa5df6d7a4e85a9ff613 100644 (file)
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
@@ -77,6 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>\r
       </elseif>\r
     </if>\r
+\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -91,12 +90,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         defaultexcludes="TRUE" \r
         excludes="*.xml *.inf"/>\r
 \r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
+      <includepath path="${PACKAGE_DIR}/Include"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <syslibset dir="${env.CYGWIN_HOME}/lib/mingw" libs="msvcr71" if="cygwin"/>\r
     </cc>\r
   </target>\r
 \r