Fix GenFvImagei build on OS X

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

diff --git a/Tools/Source/TianoTools/Common/CommonLib.c b/Tools/Source/TianoTools/Common/CommonLib.c
index e2b12b4d27ba8eb0b38f431c71920b54d1c4bb52..c07ffb9e4530dfd25a12200eb8ff1620a8fc20e2 100644 (file)
--- a/Tools/Source/TianoTools/Common/CommonLib.c
+++ b/Tools/Source/TianoTools/Common/CommonLib.c
@@ -493,3 +493,12 @@ Returns:
 \r
   return EFI_SUCCESS;\r
 }\r
+\r
+#ifdef __GNUC__\r
+void strlwr(char *s)\r
+{\r
+  for(;*s;s++) {\r
+    *s = tolower(*s);\r
+  }\r
+}\r
+#endif\r

diff --git a/Tools/Source/TianoTools/Common/CommonLib.h b/Tools/Source/TianoTools/Common/CommonLib.h
index fd8b6a48f714d4c5deb60d73f0c62460d9e17ddd..257f06693676630b2a5b38d19be4d37c14c961c0 100644 (file)
--- a/Tools/Source/TianoTools/Common/CommonLib.h
+++ b/Tools/Source/TianoTools/Common/CommonLib.h
@@ -131,6 +131,7 @@ PrintGuidToBuffer (
 #define stricmp strcasecmp\r
 #define strnicmp strncasecmp\r
 #define strcmpi strcasecmp\r
+void strlwr(char *s);\r
 #endif\r
 \r
 #endif\r

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 58cdb610a0fa9a2b9b8a7c17b47747706867ae20..2fe1342b57ea06e1f6de77fca7a4ad28298718e8 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -81,6 +81,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>\r
       </elseif>\r
     </if>\r
+\r
   </target>\r
 \r
   <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>\r
@@ -110,7 +111,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="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -142,7 +143,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="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -174,7 +175,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="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r
@@ -206,7 +207,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="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
     </cc>\r
   </target>\r