From 4cc943666fae526ea3f0098ad0c34e5996872547 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Wed, 29 Oct 2014 14:10:34 +0100 Subject: [PATCH] Autotools: MinGW: Fix building .res file in VPATH builds From a patch by Valentin Kunz, thanks! Part of https://sourceforge.net/p/geany/patches/17/ --- geany_private.rc | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geany_private.rc b/geany_private.rc index 2a1eb953c..4cf6fafc5 100644 --- a/geany_private.rc +++ b/geany_private.rc @@ -5,7 +5,7 @@ #define VER_FILEVERSION_STR "1.25" #define APP_MANIFEST 1 -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/src/Makefile.am b/src/Makefile.am index 814499053..b52443219 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -125,7 +125,7 @@ geany_LDFLAGS = -mwindows -mms-bitfields WINDRES = $(host_alias)-windres geany_private.res: - $(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff; + $(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o geany_private.res -O coff; clean-local: rm -f geany_private.res -- 2.11.4.GIT