Commit bc98c722a68f4142ad4ca38024ff6dcae37b75c4
1 parent
a032ccd2
Exists in
master
Atualizando empacotamento windows.
Showing
2 changed files
with
7 additions
and
1 deletions
Show diff stats
configure.ac
| @@ -44,6 +44,7 @@ case "$host" in | @@ -44,6 +44,7 @@ case "$host" in | ||
| 44 | 44 | ||
| 45 | CXXFLAGS="$CXXFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" | 45 | CXXFLAGS="$CXXFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" |
| 46 | LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" | 46 | LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" |
| 47 | + JNILDFLAGS="-static-libstdc++ -static-libgcc -Wl,--add-stdcall-alias" | ||
| 47 | ;; | 48 | ;; |
| 48 | 49 | ||
| 49 | s390x-*) | 50 | s390x-*) |
| @@ -54,6 +55,7 @@ case "$host" in | @@ -54,6 +55,7 @@ case "$host" in | ||
| 54 | 55 | ||
| 55 | CXXFLAGS="$CXXFLAGS -pthread -Wall" | 56 | CXXFLAGS="$CXXFLAGS -pthread -Wall" |
| 56 | LIBS="-Wl,--no-undefined -pthread $LIBS" | 57 | LIBS="-Wl,--no-undefined -pthread $LIBS" |
| 58 | + JNILDFLAGS="" | ||
| 57 | ;; | 59 | ;; |
| 58 | 60 | ||
| 59 | 61 | ||
| @@ -65,9 +67,13 @@ case "$host" in | @@ -65,9 +67,13 @@ case "$host" in | ||
| 65 | 67 | ||
| 66 | CXXFLAGS="$CXXFLAGS -Wall -Werror" | 68 | CXXFLAGS="$CXXFLAGS -Wall -Werror" |
| 67 | LIBS="-pthread $LIBS" | 69 | LIBS="-pthread $LIBS" |
| 70 | + JNILDFLAGS="" | ||
| 68 | 71 | ||
| 69 | esac | 72 | esac |
| 70 | 73 | ||
| 74 | +AC_SUBST(JNILDFLAGS) | ||
| 75 | + | ||
| 76 | + | ||
| 71 | dnl --------------------------------------------------------------------------- | 77 | dnl --------------------------------------------------------------------------- |
| 72 | dnl Check for other programs | 78 | dnl Check for other programs |
| 73 | dnl --------------------------------------------------------------------------- | 79 | dnl --------------------------------------------------------------------------- |
src/jni/Makefile.in
| @@ -84,7 +84,7 @@ JAR=@JAR@ | @@ -84,7 +84,7 @@ JAR=@JAR@ | ||
| 84 | 84 | ||
| 85 | LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ | 85 | LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ |
| 86 | CXXFLAGS=@CXXFLAGS@ -I../include | 86 | CXXFLAGS=@CXXFLAGS@ -I../include |
| 87 | -LDFLAGS=@LDFLAGS@ | 87 | +LDFLAGS=@JNILDFLAGS@ @LDFLAGS@ |
| 88 | 88 | ||
| 89 | #---[ Rules ]---------------------------------------------------------------------------- | 89 | #---[ Rules ]---------------------------------------------------------------------------- |
| 90 | 90 |