Fixes for gcc builds.

[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 6c9970625ef5e11d8e50c87af113e74975940ff0..c0ba17ab8349dcc554d0ebbae6d18e834d25af81 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -65,31 +65,56 @@ 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
+        <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
@@ -98,9 +123,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
@@ -111,20 +134,17 @@ 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
-\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
@@ -146,12 +166,10 @@ 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
-\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
@@ -168,7 +186,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </defineset>\r
     \r
       <fileset dir="${basedir}/${ToolName}" \r
-        includes="${FileSet} x64/PeCoffLoaderEx.c"  \r
+        includes="${FileSet} X64/PeCoffLoaderEx.c"  \r
         defaultexcludes="TRUE" \r
         excludes="*.xml *.inf"/>\r
 \r
@@ -180,18 +198,16 @@ 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
-\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
@@ -214,12 +230,10 @@ 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
-\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
@@ -235,11 +249,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <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