From fddaa6adebcb78a513dfb401711b0ea04d70d8f9 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 5 May 2016 20:13:56 +0200 Subject: [PATCH 1/1] Make windres configurable The windres program is typically not called windres for cross compilation. Now you can call configure with the argument WINDRES=x86_64-w64-mingw32-windres in order to use the windres program on a standard debian installation. --- configure.ac | 2 ++ src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3b1a900ddb..0cc706c60e 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,8 @@ AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi]) AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) AC_CHECK_LIB(ole32, main) +test x"$WINDRES" = x && WINDRES=windres +AC_SUBST(WINDRES) LYX_USE_INCLUDED_BOOST LYX_USE_INCLUDED_MYTHES diff --git a/src/Makefile.am b/src/Makefile.am index 8166b11ff4..57f66d9070 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,7 @@ lyx_LDADD = \ if LYX_WIN_RESOURCE .rc.o: cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico . - windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@ + $(WINDRES) -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@ endif if INSTALL_MACOSX -- 2.39.2