Use dllimport to link gd fonts on Windows

Using extern to link the gd fonts on Windows doesn't work, they should be
imported from the DLL using __declspec(dllimport).
Also update the libgd DLL to the most recent version.

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index f989d002e5d72a2c0a0c4d03c8de70095acc8d58..5008754f038c6ac85174de639a3ad09d70161c9a 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -293,7 +293,12 @@ static void gdgen_missingfont(char *err, char *fontreq)
 /* fontsize at which text is rendered by a simple line */
 #define FONTSIZE_TOO_SMALL 1.5
 
-extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
+#ifdef _WIN32
+#   define GD_IMPORT __declspec(dllimport)
+#else
+#   define GD_IMPORT extern
+#endif
+GD_IMPORT gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
 
 void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str)
 {

diff --git a/windows/dependencies/libraries b/windows/dependencies/libraries
index 95a696430d3c5ac67c3c122f951e42282bec5c86..7cb2b3437a3d104d869a534a780805b27d086a6a 160000 (submodule)
--- a/windows/dependencies/libraries
+++ b/windows/dependencies/libraries
@@ -1 +1 @@
-Subproject commit 95a696430d3c5ac67c3c122f951e42282bec5c86
+Subproject commit 7cb2b3437a3d104d869a534a780805b27d086a6a