Fix GenFvImagei build on OS X

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

3 files changed, 15 insertions, 4 deletions

diff --git a/Tools/Source/TianoTools/Common/CommonLib.c b/Tools/Source/TianoTools/Common/CommonLib.c
index e2b12b4..c07ffb9 100644
--- a/Tools/Source/TianoTools/Common/CommonLib.c
+++ b/Tools/Source/TianoTools/Common/CommonLib.c
@@ -493,3 +493,12 @@ Returns:
 

   return EFI_SUCCESS;

 }

+

+#ifdef __GNUC__

+void strlwr(char *s)

+{

+  for(;*s;s++) {

+    *s = tolower(*s);

+  }

+}

+#endif

diff --git a/Tools/Source/TianoTools/Common/CommonLib.h b/Tools/Source/TianoTools/Common/CommonLib.h
index fd8b6a4..257f066 100644
--- a/Tools/Source/TianoTools/Common/CommonLib.h
+++ b/Tools/Source/TianoTools/Common/CommonLib.h
@@ -131,6 +131,7 @@ PrintGuidToBuffer (
 #define stricmp strcasecmp

 #define strnicmp strncasecmp

 #define strcmpi strcasecmp

+void strlwr(char *s);

 #endif

 

 #endif

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 58cdb61..2fe1342 100644
--- 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>

       </elseif>

     </if>

+

   </target>

 

   <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>

@@ -110,7 +111,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>

       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>

       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>

-      <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/>

+      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->

       <syslibset libs="RpcRT4" unless="gcc"/>

     </cc>

   </target>

@@ -142,7 +143,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>

       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>

       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>

-      <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/>

+      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->

       <syslibset libs="RpcRT4" unless="gcc"/>

     </cc>

   </target>

@@ -174,7 +175,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>

       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>

       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>

-      <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/>

+      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->

       <syslibset libs="RpcRT4" unless="gcc"/>

     </cc>

   </target>

@@ -206,7 +207,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>

       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>

       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>

-      <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/>

+      <!-- <syslibset dir="${env.CYGWIN_HOME}/lib/e2fsprogs" libs="uuid" if="gcc"/> -->

       <syslibset libs="RpcRT4" unless="gcc"/>

     </cc>

   </target>