Download as
Browse Code »

Commit 423d3abe0f1f849a548296614dd46384656d3d6f

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

Adding files requires for windows SDK package.

Showing 2 changed files with 26 additions and 1 deletions   Show diff stats
@@ -69,6 +69,7 @@ GENMARSHAL=@GENMARSHAL@ @@ -69,6 +69,7 @@ GENMARSHAL=@GENMARSHAL@
69 CONVERT=@CONVERT@ 69 CONVERT=@CONVERT@
70 OPTIPNG=@OPTIPNG@ 70 OPTIPNG=@OPTIPNG@
71 ZIP=@ZIP@ 71 ZIP=@ZIP@
  72 +DLLTOOL=@DLLTOOL@
72 73
73 #---[ Paths ]---------------------------------------------------------------------------- 74 #---[ Paths ]----------------------------------------------------------------------------
74 75
@@ -343,6 +344,28 @@ install-dev: \ @@ -343,6 +344,28 @@ install-dev: \
343 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 344 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
344 @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot 345 @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot
345 346
  347 +install-winlib: \
  348 + $(BINRLS)/$(SONAME)
  349 +
  350 + @$(MKDIR) \
  351 + $(DESTDIR)$(libdir)
  352 +
  353 + @$(INSTALL_DATA) \
  354 + $(BINRLS)/$(LIBNAME).dll.a \
  355 + $(DESTDIR)$(libdir)
  356 +
  357 + @$(DLLTOOL) \
  358 + --input-def $(BINRLS)/$(LIBNAME).def \
  359 + --dllname $(LIBNAME).dll \
  360 + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib
  361 +
  362 + @$(MKDIR) \
  363 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  364 +
  365 + @$(INSTALL_DATA) \
  366 + $(BINRLS)/$(LIBNAME).def \
  367 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  368 +
346 install-glade: 369 install-glade:
347 370
348 @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs 371 @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs
@@ -60,6 +60,7 @@ AC_PATH_TOOL([AR], [ar], [ar]) @@ -60,6 +60,7 @@ AC_PATH_TOOL([AR], [ar], [ar])
60 AC_PATH_TOOL([CONVERT], [convert], [no]) 60 AC_PATH_TOOL([CONVERT], [convert], [no])
61 AC_PATH_TOOL([OPTIPNG],[optipng],[no]) 61 AC_PATH_TOOL([OPTIPNG],[optipng],[no])
62 AC_PATH_TOOL([ZIP],[zip],[no]) 62 AC_PATH_TOOL([ZIP],[zip],[no])
  63 +AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
63 64
64 AC_LANG([C]) 65 AC_LANG([C])
65 66
@@ -88,8 +89,9 @@ case "$host" in @@ -88,8 +89,9 @@ case "$host" in
88 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 89 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
89 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 90 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
90 LDFLAGS="$LDFLAGS -pthread" 91 LDFLAGS="$LDFLAGS -pthread"
91 - DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def" 92 + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a"
92 DLLEXT=".dll" 93 DLLEXT=".dll"
  94 + INSTALL_PACKAGES="${INSTALL_PACKAGES} winlib"
93 95
94 app_cv_static='yes' 96 app_cv_static='yes'
95 97