Support building on x64 hosts.

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

diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
index 0864961f1ee8674ad0c1491823edee861e3c1437..05035f488a3d6e2153e6636515b737541e504466 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/build.xml
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -61,42 +61,42 @@ 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" unless="gcc">\r
+  <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
         libtool="${haveLibtool}"\r
-        optimize="speed">\r
+        debug="false">\r
+\r
+      <compilerarg value="-fshort-wchar" if="gcc"/>\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
         includes="${FileSet}" \r
         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 String"/>\r
     </cc>\r
   </target>\r
 \r