From 9231438eea8deff14dceb555b767bf92f16beca4 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 28 Jun 2019 16:05:51 -0300 Subject: [PATCH] Fixing windows package. --- Makefile.in | 6 ++++-- configure.ac | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4f58c99..610bb8f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,6 +115,8 @@ GTK_LIBS=@GTK_LIBS@ V3270_LIBS=@V3270_LIBS@ GLIB_LIBS=@GLIB_LIBS@ DBUS_LIBS=@DBUS_LIBS@ @GDBUS_LIBS@ +STATIC_LDFLAGS=@STATIC_LDFLAGS@ +LDFLAGS=@LDFLAGS@ LIBS= \ @LIBS@ \ @@ -274,7 +276,7 @@ $(BINRLS)/lib$(LIBRARY_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERS @$(CXX) \ -shared -Wl,-soname,$(@F) \ -o $@ \ - $(LDFLAGS) \ + $(LDFLAGS) $(STATIC_LDFLAGS)\ $(foreach SRC, $(basename $(LIBRARY_SOURCES)), $(OBJRLS)/$(SRC).o) \ -lpw3270cpp \ -L$(BINDBG) \ @@ -440,7 +442,7 @@ $(BINDBG)/lib$(LIBRARY_NAME)@DLLEXT@: \ @$(CXX) \ -shared -Wl,-soname,$(@F) \ -o $@ \ - $(LDFLAGS) \ + $(LDFLAGS) $(STATIC_LDFLAGS)\ $(foreach SRC, $(basename $(LIBRARY_SOURCES)), $(OBJDBG)/$(SRC).o) \ -lpw3270cpp \ -L$(BINDBG) \ diff --git a/configure.ac b/configure.ac index 5a61807..79e6f7e 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ case "$host" in CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" - LDFLAGS="-static-libgcc -static-libstdc++ $LDFLAGS" + STATIC_LDFLAGS="-static-libgcc -static-libstdc++" DLLEXT=".dll" DLLPREFIX="" @@ -109,6 +109,8 @@ AC_SUBST(LIBS) AC_SUBST(LOGDIR) AC_SUBST(DLLEXT) AC_SUBST(DLLPREFIX) +AC_SUBST(STATIC_LDFLAGS) +AC_SUBST(LDFLAGS) dnl --------------------------------------------------------------------------- dnl Check for other programs -- libgit2 0.21.2