Atualizando empacotamento windows.

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