diff -Nru orig/gdtools/src/Makevars.win patched/gdtools/src/Makevars.win
--- orig/gdtools/src/Makevars.win	2020-04-03 13:10:33.000000000 +0200
+++ patched/gdtools/src/Makevars.win	2020-07-02 18:06:23.532993800 +0200
@@ -1,13 +1,5 @@
-VERSION = 1.16.0
-RWINLIB = ../windows/cairo-${VERSION}
 
-PKG_CPPFLAGS = -I${RWINLIB}/include/cairo -I${RWINLIB}/include \
-	-I${RWINLIB}/include/freetype2 -I../inst/include
+PKG_CPPFLAGS = -I../inst/include -I$(LOCAL_SOFT)/include/cairo -I$(LOCAL_SOFT)/include/freetype2
 
-PKG_LIBS = -L${RWINLIB}/lib${R_ARCH} -lcairo -lfreetype -lpng -lpixman-1 \
-  -lharfbuzz -lbz2 -lz -liconv -lgdi32
+PKG_LIBS = -lcairo -lfontconfig -lintl -liconv -lexpat -lfreetype -lharfbuzz -lpixman-1 -lpng -lbz2 -lz -lgdi32 -lmsimg32
 
-all: winlibs
-
-winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" ${VERSION}