aboutsummaryrefslogtreecommitdiff
path: root/flow-native
diff options
context:
space:
mode:
Diffstat (limited to 'flow-native')
-rw-r--r--flow-native/configure.ac15
-rw-r--r--flow-native/src/Makefile.am8
2 files changed, 20 insertions, 3 deletions
diff --git a/flow-native/configure.ac b/flow-native/configure.ac
index 1b622c4..4841b67 100644
--- a/flow-native/configure.ac
+++ b/flow-native/configure.ac
@@ -43,6 +43,21 @@ AC_ARG_ENABLE([versioned-lib],
AM_CONDITIONAL([ENABLE_VERSIONED_LIB], [test "$enable_versioned_lib" = "yes"])
+EXTRA_CFLAGS=""
+EXTRA_LDFLAGS=""
+
+case "$host_os" in
+ cygwin*)
+ EXTRA_CFLAGS="-D __int64=int64_t"
+ EXTRA_LDFLAGS="-no-undefined"
+ ;;
+ *)
+ ;;
+esac
+
+AC_SUBST([EXTRA_CFLAGS])
+AC_SUBST([EXTRA_LDFLAGS])
+
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_OUTPUT
diff --git a/flow-native/src/Makefile.am b/flow-native/src/Makefile.am
index 9fefbd1..da5989f 100644
--- a/flow-native/src/Makefile.am
+++ b/flow-native/src/Makefile.am
@@ -3,7 +3,9 @@ lib_LTLIBRARIES = libflow3.la
libflow3_la_SOURCES = flow_jni.c platform/posix/flow.c flow.h com_github_jodersky_flow_internal_NativeSerial.h
if ENABLE_VERSIONED_LIB
-libflow3_la_LDFLAGS = -version-info 0:1:0
+libflow3_la_LDFLAGS = -version-info 0:1:0 $(EXTRA_LDFLAGS)
else
-libflow3_la_LDFLAGS = -avoid-version
-endif \ No newline at end of file
+libflow3_la_LDFLAGS = -avoid-version $(EXTRA_LDFLAGS)
+endif
+
+AM_CFLAGS = $(EXTRA_CFLAGS)