From 423d3abe0f1f849a548296614dd46384656d3d6f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 7 Oct 2019 09:48:04 -0300 Subject: [PATCH] Adding files requires for windows SDK package. --- Makefile.in | 23 +++++++++++++++++++++++ configure.ac | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 166cf69..8689d79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,6 +69,7 @@ GENMARSHAL=@GENMARSHAL@ CONVERT=@CONVERT@ OPTIPNG=@OPTIPNG@ ZIP=@ZIP@ +DLLTOOL=@DLLTOOL@ #---[ Paths ]---------------------------------------------------------------------------- @@ -343,6 +344,28 @@ install-dev: \ @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot +install-winlib: \ + $(BINRLS)/$(SONAME) + + @$(MKDIR) \ + $(DESTDIR)$(libdir) + + @$(INSTALL_DATA) \ + $(BINRLS)/$(LIBNAME).dll.a \ + $(DESTDIR)$(libdir) + + @$(DLLTOOL) \ + --input-def $(BINRLS)/$(LIBNAME).def \ + --dllname $(LIBNAME).dll \ + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib + + @$(MKDIR) \ + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def + + @$(INSTALL_DATA) \ + $(BINRLS)/$(LIBNAME).def \ + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def + install-glade: @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs diff --git a/configure.ac b/configure.ac index 1e18a10..b721878 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,7 @@ AC_PATH_TOOL([AR], [ar], [ar]) AC_PATH_TOOL([CONVERT], [convert], [no]) AC_PATH_TOOL([OPTIPNG],[optipng],[no]) AC_PATH_TOOL([ZIP],[zip],[no]) +AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) AC_LANG([C]) @@ -88,8 +89,9 @@ 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,\$(@D)/\$(LIBNAME).def" + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a" DLLEXT=".dll" + INSTALL_PACKAGES="${INSTALL_PACKAGES} winlib" app_cv_static='yes' -- libgit2 0.21.2