Support for making DLL correctly on Cygwin

diff --git a/Makefile.am b/Makefile.am
index 1e545bb14fa661cdf1c0f0b0d471242c66dd462f..9f4556227e236341150d2b040fcc36aac2fa9e52 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS       = -std=gnu99 -D_LARGEFILE_SOURCE \
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 4:0:2
+libwim_la_LDFLAGS = -version-info 4:0:2 $(CYGWIN_EXTRA_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -86,7 +86,7 @@ libwim_la_LIBADD =            \
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
-       -fvisibility=hidden     \
+       $(VISIBILITY_CFLAGS)    \
        $(LIBXML2_CFLAGS)       \
        $(LIBFUSE_CFLAGS)       \
        $(LIBNTFS_3G_CFLAGS)    \

diff --git a/configure.ac b/configure.ac
index 3b02ef84735a95bcfc6d2d3f62e13b7a667e7e9f..c0c0f132274a4bf44243782420990e4f897614ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -323,4 +323,22 @@ AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD])
 AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS])
 AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES])
 
+case "$host" in
+       *-*-cygwin*)
+               dnl -no-undefined is needed to build a DLL in a Cygwin environment.
+               CYGWIN_EXTRA_LDFLAGS="-no-undefined"
+
+               dnl -fvisibility=hidden should not be used in a Cygwin
+               dnl  environment
+               VISIBILITY_CFLAGS=""
+               ;;
+       *)
+               CYGWIN_EXTRA_LDFLAGS=""
+               VISIBILITY_CFLAGS="-fvisibility=hidden"
+               ;;
+esac
+
+AC_SUBST([CYGWIN_EXTRA_LDFLAGS], [$CYGWIN_EXTRA_LDFLAGS])
+AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
+
 AC_OUTPUT

diff --git a/src/util.h b/src/util.h
index 4f4056660e282dd2ca457584acdc7484be597b42..b79490e8ad4c3ff180105ea3c353c43af6bccd64 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -9,7 +9,11 @@
 #include "config.h"
 
 #ifdef __GNUC__
-#      define WIMLIBAPI __attribute__((visibility("default")))
+#      if defined(__CYGWIN__) || defined(__WIN32__)
+#              define WIMLIBAPI __declspec(dllexport)
+#      else
+#              define WIMLIBAPI __attribute__((visibility("default")))
+#      endif
 #      define ALWAYS_INLINE inline __attribute__((always_inline))
 #      define PACKED __attribute__((packed))
 #      define FORMAT(type, format_str, args_start) \