From 1aba1e0256368c0bc187c3779bef257310c356b7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 28 Sep 2017 17:00:29 +0100 Subject: [PATCH 2/5] Windows: Use libtool-detected RC to compile resources in tools/ We have two variables that both expand to i686-w64-mingw32-windres, namely WINDRES and RC, and we might as well use the same one as in dbus/ here. However, it seems we can't wrap windres in libtool when producing an executable: if we use .rc.lo, my Automake 1.15.1 doesn't realise that it needs to include disable-uac.lo in the list of objects, whereas if we use .rc.o, Ralf's libtool 2.4.2 and Automake 1.13.4 disagree on where the output should go (.libs/disable-uac.o vs. disable-uac.o) and the link fails. Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015 --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 96ce03fa..25092011 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -118,7 +118,7 @@ if DBUS_WIN SUFFIXES = .rc .rc.o: - $(WINDRES) $< -o $@ + $(RC) $< -o $@ nodist_dbus_update_activation_environment_SOURCES = disable-uac.rc -- 2.14.2