Fix EDKT140(CompressDll.dll does not build under cygwin gcc).

[mirror_edk2.git] / Tools / Source / TianoTools / CompressDll / build.xml

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index ff80a6c4ed692699774e2faa7ffffb54eb56fd08..1aa5fb6ac8e335f56ded426bd725c260688e452f 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r


@@ -49,10 +49,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r

-      <includepath path="${env.JAVA_HOME}/include/linux" if="cyglinux"/>\r
+      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="cygwin"/>\r

       <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" if="msft"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" if="msft"/>\r

+      <linkerarg value="-mno-cygwin" if="cygwin"/>\r
+      <linkerarg value="--add-stdcall-alias" if="cygwin"/>\r

     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r