Download as
Browse Code »

Commit 9231438eea8deff14dceb555b767bf92f16beca4

Authored by Perry Werneck
1 parent 90eb0a93
Exists in master and in 1 other branch develop

Fixing windows package.

Showing 2 changed files with 7 additions and 3 deletions   Show diff stats
Makefile.in
  Diff comments   View file @9231438
... ... @@ -115,6 +115,8 @@ GTK_LIBS=@GTK_LIBS@
115 115 V3270_LIBS=@V3270_LIBS@
116 116 GLIB_LIBS=@GLIB_LIBS@
117 117 DBUS_LIBS=@DBUS_LIBS@ @GDBUS_LIBS@
  118 +STATIC_LDFLAGS=@STATIC_LDFLAGS@
  119 +LDFLAGS=@LDFLAGS@
118 120  
119 121 LIBS= \
120 122 @LIBS@ \
... ... @@ -274,7 +276,7 @@ $(BINRLS)/lib$(LIBRARY_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERS
274 276 @$(CXX) \
275 277 -shared -Wl,-soname,$(@F) \
276 278 -o $@ \
277   - $(LDFLAGS) \
  279 + $(LDFLAGS) $(STATIC_LDFLAGS)\
278 280 $(foreach SRC, $(basename $(LIBRARY_SOURCES)), $(OBJRLS)/$(SRC).o) \
279 281 -lpw3270cpp \
280 282 -L$(BINDBG) \
... ... @@ -440,7 +442,7 @@ $(BINDBG)/lib$(LIBRARY_NAME)@DLLEXT@: \
440 442 @$(CXX) \
441 443 -shared -Wl,-soname,$(@F) \
442 444 -o $@ \
443   - $(LDFLAGS) \
  445 + $(LDFLAGS) $(STATIC_LDFLAGS)\
444 446 $(foreach SRC, $(basename $(LIBRARY_SOURCES)), $(OBJDBG)/$(SRC).o) \
445 447 -lpw3270cpp \
446 448 -L$(BINDBG) \
... ...
configure.ac
  Diff comments   View file @9231438
... ... @@ -81,7 +81,7 @@ case "$host" in
81 81  
82 82 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
83 83 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
84   - LDFLAGS="-static-libgcc -static-libstdc++ $LDFLAGS"
  84 + STATIC_LDFLAGS="-static-libgcc -static-libstdc++"
85 85 DLLEXT=".dll"
86 86 DLLPREFIX=""
87 87  
... ... @@ -109,6 +109,8 @@ AC_SUBST(LIBS)
109 109 AC_SUBST(LOGDIR)
110 110 AC_SUBST(DLLEXT)
111 111 AC_SUBST(DLLPREFIX)
  112 +AC_SUBST(STATIC_LDFLAGS)
  113 +AC_SUBST(LDFLAGS)
112 114  
113 115 dnl ---------------------------------------------------------------------------
114 116 dnl Check for other programs
... ...