A couple of cleanups in the TianoTools build.

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

diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index 472160f6733c822cb7fa1db2ea514447ad1c1f97..e9235063f3e6b4e60b37c0e59148794f5c107de3 100644 (file)
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -21,7 +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
@@ -61,22 +60,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -92,11 +91,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\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
     </cc>\r
   </target>\r
 \r