3 files changed, 9 insertions, 2 deletions
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.c b/Tools/Source/TianoTools/CompressDll/CompressDll.c
index 3c6fc8cb4d..cc06f26c05 100644
--- a/Tools/Source/TianoTools/CompressDll/CompressDll.c
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.c
@@ -11,6 +11,9 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
+#if defined(__GNUC__)
+typedef long long __int64;/*For cygwin build*/
+#endif
 #include "CompressDll.h"
 #include "EfiCompress.h"
 
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.h b/Tools/Source/TianoTools/CompressDll/CompressDll.h
index 3b0fbb2cee..fa3b83cd10 100644
--- a/Tools/Source/TianoTools/CompressDll/CompressDll.h
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.h
@@ -1,4 +1,5 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
 #include <jni.h>
 /* Header for class org_tianocore_frameworktasks_Compress */
 
diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index ff80a6c4ed..1aa5fb6ac8 100644
--- 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"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -49,10 +49,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <includepath path="${env.JAVA_HOME}/include"/>
-      <includepath path="${env.JAVA_HOME}/include/linux" if="cyglinux"/>
+      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>
+      <includepath path="${env.JAVA_HOME}/include/win32" if="cygwin"/>
       <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
       <syslibset libs="kernel32" if="msft"/>
+      <linkerarg value="-mno-cygwin" if="cygwin"/>
+      <linkerarg value="--add-stdcall-alias" if="cygwin"/>
     </cc>
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>