From 4ca1cd8525852cbf55b5a6001d9064644fb398ab Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 20 May 2010 13:25:33 +0000 Subject: [PATCH] Bug #618647 - Compile .ico as resource into gnucash-bin.exe, patch by Tao Wang git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19186 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.ac | 1 + src/bin/Makefile.am | 17 ++++++++++++++++- src/bin/gnucash.rc | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/bin/gnucash.rc diff --git a/configure.ac b/configure.ac index ad37165729..db754212c7 100644 --- a/configure.ac +++ b/configure.ac @@ -261,6 +261,7 @@ update to latest darwin]) platform=win32 AC_MSG_RESULT($platform) GNUCASH_ENVIRONMENT="environment-win32" + LT_PROG_RC AC_MSG_CHECKING(for native win32) case $host_os in diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 6c71ebdc22..4d3923afa4 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -17,8 +17,23 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \ -I${top_srcdir}/src/libqof/qof \ ${GUILE_INCS} +if PLATFORM_WIN32 +GNUCASH_RESOURCE_FILE = gnucash.rc +else +GNUCASH_RESOURCE_FILE = +endif + +SUFFIXES = .rc .res + +if PLATFORM_WIN32 +.rc.res: + $(AM_V_GEN)$(RC) -i '$<' --input-format=rc -o '$@' -O coff +endif + +dist_noinst_DATA = gnucash.rc + bin_PROGRAMS = gnucash-bin -gnucash_bin_SOURCES = gnucash-bin.c +gnucash_bin_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE} gnucash_bin_LDADD = \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ diff --git a/src/bin/gnucash.rc b/src/bin/gnucash.rc new file mode 100644 index 0000000000..fc7376f2c2 --- /dev/null +++ b/src/bin/gnucash.rc @@ -0,0 +1 @@ +APPLICATION_ICON ICON DISCARDABLE "../pixmaps/gnucash-icon.ico"