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