One GenFvImage can handle all archs now.

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

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index d29a2eca9757cd3bb82926e4528dc0b954c0de0d..c57ec2968e17e9cb7fefeed2e92b1ad3c1160a78 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -24,9 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property environment="env"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
-  <property name="BUILD_DIR_IA32" value="${PACKAGE_DIR}/${ToolName}/tmp/Ia32"/>\r
-  <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${ToolName}/tmp/X64"/>\r
-  <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${ToolName}/tmp/Ipf"/>\r
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
     <echo message="Building the EDK Tool: ${ToolName}"/>\r
@@ -34,9 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <target name="init">\r
     <echo message="The EDK Tool: ${ToolName}"/>\r
-    <mkdir dir="${BUILD_DIR_IA32}"/>\r
-    <mkdir dir="${BUILD_DIR_X64}"/>\r
-    <mkdir dir="${BUILD_DIR_IPF}"/>\r
+    <mkdir dir="${BUILD_DIR}"/>\r
     <if>\r
       <equals arg1="${GCC}" arg2="cygwin"/>\r
       <then>\r
@@ -109,10 +105,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     \r
   </target>\r
 \r
-  <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>\r
+  <target name="Tool" depends="init, GenFvImage"/>\r
 \r
   <target name="GenFvImage" >\r
-    <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
         optimize="speed">\r
@@ -134,95 +130,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
       <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>\r
-      <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
-      <syslibset libs="RpcRT4" unless="gcc"/>\r
-    </cc>\r
-  </target>\r
-\r
-  <target name="GenFvImage_Ia32">\r
-    <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
-        outfile="${BIN_DIR}/${ToolName}_Ia32"\r
-        outtype="executable"\r
-        optimize="speed">\r
-\r
-      <defineset>\r
-        <define name="BUILDING_TOOLS"/>\r
-        <define name="TOOL_BUILD_IA32_TARGET"/>\r
-      </defineset>\r
-    \r
-      <fileset dir="${basedir}/${ToolName}" \r
-        includes="${FileSet}"/>\r
-\r
-      <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\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="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
-      <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>\r
-      <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
-      <syslibset libs="RpcRT4" unless="gcc"/>\r
-    </cc>\r
-  </target>\r
-\r
-  <target name="GenFvImage_X64">\r
-    <cc name="${ToolChain}" objdir="${BUILD_DIR_X64}" \r
-        outfile="${BIN_DIR}/${ToolName}_X64"\r
-        outtype="executable"\r
-        optimize="speed">\r
-\r
-      <defineset>\r
-        <define name="BUILDING_TOOLS"/>\r
-        <define name="TOOL_BUILD_X64_TARGET"/>\r
-      </defineset>\r
-    \r
-      <fileset dir="${basedir}/${ToolName}" \r
-        includes="${FileSet}"/>\r
-\r
-      <includepath path="${PACKAGE_DIR}/${ToolName}"/>\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="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
-      <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_X64"/>\r
-      <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
-      <syslibset libs="RpcRT4" unless="gcc"/>\r
-    </cc>\r
-  </target>\r
-\r
-  <target name="GenFvImage_Ipf">\r
-    <cc name="${ToolChain}" objdir="${BUILD_DIR_IPF}" \r
-        outfile="${BIN_DIR}/${ToolName}_Ipf"\r
-        outtype="executable"\r
-        optimize="speed">\r
-\r
-      <defineset>\r
-        <define name="BUILDING_TOOLS"/>\r
-        <define name="TOOL_BUILD_IPF_TARGET"/>\r
-      </defineset>\r
-    \r
-      <fileset dir="${basedir}/${ToolName}" \r
-        includes="${FileSet}"/>\r
-\r
-      <includepath path="${PACKAGE_DIR}/${ToolName}"/>\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="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
-      <includepath path="${PACKAGE_DIR}/Common"/>\r
-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ipf"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
@@ -232,9 +140,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <target name="clean" depends="init">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
-      <fileset dir="${BUILD_DIR_IA32}" includes="*.obj"/>\r
-      <fileset dir="${BUILD_DIR_X64}" includes="*.obj"/>\r
-      <fileset dir="${BUILD_DIR_IPF}" includes="*.obj"/>\r
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r