From d2eea719183fa852058da6c5fd9855d9e2297ba9 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 12 Feb 2019 09:32:28 -0200 Subject: [PATCH] Adding .def and .a files on windows builds. --- configure.ac | 2 +- src/lib3270++/Makefile.in | 5 ++--- src/lib3270/Makefile.in | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 04c4e00..c5b6abf 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ case "$host" in CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" LDFLAGS="$LDFLAGS -pthread" - DLL_LDFLAGS="-shared -Wl,--output-def,\$@.def" + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).a" DLLEXT=".dll" app_win32_revision=$(date +%y.%m.%d.%H) diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in index 7fc3d93..f2f55d0 100644 --- a/src/lib3270++/Makefile.in +++ b/src/lib3270++/Makefile.in @@ -201,12 +201,11 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) - @$(MKDIR) `dirname $@` + @$(MKDIR) $(@D) @echo $< ... @$(LD) \ - -shared \ - -Wl,-soname,$(@F) \ + @DLL_LDFLAGS@ \ -o $@ \ $(LDFLAGS) \ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 046c148..44f3c9a 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -202,7 +202,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) - @$(MKDIR) `dirname $@` + @$(MKDIR) $(@D) @echo $< ... @$(LD) \ @DLL_LDFLAGS@ \ -- libgit2 0.21.2