</echo>\r
</else>\r
</if>\r
- <if>\r
- <equals arg1="${ToolChain}" arg2="msvc"/>\r
- <then>\r
+ <property name="ToolChain" value="gcc"/>\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
+\r
+ <condition property="syslibdirs" value="">\r
+ <os family="mac"/>\r
+ </condition>\r
+ \r
+ <condition property="syslibs" value="">\r
+ <os family="mac"/>\r
+ </condition>\r
+ \r
+ <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">\r
+ <os family="windows"/>\r
+ </condition>\r
+ \r
+ <condition property="syslibs" value="uuid">\r
+ <os family="windows"/>\r
+ </condition>\r
+ \r
+ <condition property="syslibdirs" value="/usr/lib">\r
+ <os name="Linux"/>\r
+ </condition>\r
+ \r
+ <condition property="syslibs" value="uuid">\r
+ <os name="Linux"/>\r
+ </condition>\r
+ \r
</target>\r
\r
- <target name="Tool" depends="init, GenFvImage, GenFvImage_IA32, GenFvImage_X64, GenFvImage_IPF"/>\r
+ <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>\r
\r
- <target name="GenFvImage">\r
+ <target name="GenFvImage" >\r
<cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
outfile="${BIN_DIR}/${ToolName}"\r
outtype="executable"\r
- libtool="${haveLibtool}"\r
optimize="speed">\r
\r
<defineset>\r
</defineset>\r
\r
<fileset dir="${basedir}/${ToolName}" \r
- includes="${FileSet} Ia32/PeCoffLoaderEx.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
+ includes="${FileSet} Ia32/PeCoffLoaderEx.c" />\r
\r
<includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
<includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\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
</cc>\r
</target>\r
\r
- <target name="GenFvImage_IA32">\r
+ <target name="GenFvImage_Ia32">\r
<cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
- outfile="${BIN_DIR}/${ToolName}_IA32"\r
+ outfile="${BIN_DIR}/${ToolName}_Ia32"\r
outtype="executable"\r
- libtool="${haveLibtool}"\r
optimize="speed">\r
\r
<defineset>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
<includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\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
</cc>\r
</target>\r
\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
<includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\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
</cc>\r
</target>\r
\r
- <target name="GenFvImage_IPF">\r
+ <target name="GenFvImage_Ipf">\r
<cc name="${ToolChain}" objdir="${BUILD_DIR_IPF}" \r
- outfile="${BIN_DIR}/${ToolName}_IPF"\r
+ outfile="${BIN_DIR}/${ToolName}_Ipf"\r
outtype="executable"\r
libtool="${haveLibtool}"\r
optimize="speed">\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
<includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
<includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\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
</cc>\r
</target>\r
\r
<target name="cleanall" depends="init">\r
<echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/> \r
<delete dir="${PACKAGE_DIR}/${ToolName}/tmp">\r
- \r
- <fileset dir="${BIN_DIR}" includes="${ToolName}_IA32${ext_exe}"/>\r
+ \r
+ <fileset dir="${BIN_DIR}" includes="${ToolName}_Ia32${ext_exe}"/>\r
<fileset dir="${BIN_DIR}" includes="${ToolName}_X64${ext_exe}"/>\r
<fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
- <fileset dir="${BIN_DIR}" includes="${ToolName}_IPF${ext_exe}"/>\r
+ <fileset dir="${BIN_DIR}" includes="${ToolName}_Ipf${ext_exe}"/>\r
</delete>\r
</target>\r
\r