[geany/geany] 4cc943: Autotools: MinGW: Fix building .res file in VPATH builds

Colomban Wendling git-noreply at xxxxx
Tue Jan 20 15:16:10 UTC 2015


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 09 Nov 2014 16:40:31 UTC
Commit:      4cc943666fae526ea3f0098ad0c34e5996872547
             https://github.com/geany/geany/commit/4cc943666fae526ea3f0098ad0c34e5996872547

Log Message:
-----------
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/


Modified Paths:
--------------
    geany_private.rc
    src/Makefile.am

Modified: geany_private.rc
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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


Modified: src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list