Fixes for gcc builds.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@178 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 2fe1342b57ea06e1f6de77fca7a4ad28298718e8..c0ba17ab8349dcc554d0ebbae6d18e834d25af81 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -65,6 +65,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
+        <property name="ToolChain" value="gcc"/>\r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
       <then>\r
@@ -82,6 +83,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </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
@@ -111,7 +136,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -143,7 +168,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -175,7 +200,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -207,7 +232,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
index 1a090b3bedb886cc0d5998c77f20db21c6e7c905..96ce31e29bca72a33ad637ab59178eec02f1b7ed 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
+++ b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
@@ -26,7 +26,7 @@ Abstract:
 #include <ctype.h>\r
 \r
 #include <Base.h>\r
-#include <UEfiBaseTypes.h>\r
+#include <UefiBaseTypes.h>\r
 #include "EfiUtilityMsgs.h"\r
 #include <CommonLib.h>\r
 \r