From bc98c722a68f4142ad4ca38024ff6dcae37b75c4 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 1 Aug 2017 16:43:50 -0300 Subject: [PATCH] Atualizando empacotamento windows. --- configure.ac | 6 ++++++ src/jni/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ea54b73..b2c5676 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,7 @@ case "$host" in CXXFLAGS="$CXXFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" + JNILDFLAGS="-static-libstdc++ -static-libgcc -Wl,--add-stdcall-alias" ;; s390x-*) @@ -54,6 +55,7 @@ case "$host" in CXXFLAGS="$CXXFLAGS -pthread -Wall" LIBS="-Wl,--no-undefined -pthread $LIBS" + JNILDFLAGS="" ;; @@ -65,9 +67,13 @@ case "$host" in CXXFLAGS="$CXXFLAGS -Wall -Werror" LIBS="-pthread $LIBS" + JNILDFLAGS="" esac +AC_SUBST(JNILDFLAGS) + + dnl --------------------------------------------------------------------------- dnl Check for other programs dnl --------------------------------------------------------------------------- diff --git a/src/jni/Makefile.in b/src/jni/Makefile.in index 4ec21bd..1b0c891 100644 --- a/src/jni/Makefile.in +++ b/src/jni/Makefile.in @@ -84,7 +84,7 @@ JAR=@JAR@ LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ CXXFLAGS=@CXXFLAGS@ -I../include -LDFLAGS=@LDFLAGS@ +LDFLAGS=@JNILDFLAGS@ @LDFLAGS@ #---[ Rules ]---------------------------------------------------------------------------- -- libgit2 0.21.2