r19186 - gnucash/trunk - Bug #618647 - Compile .ico as resource into gnucash-bin.exe, patch by Tao Wang

[Geert Janssens]

Author: gjanssens
Date: 2010-05-20 09:25:33 -0400 (Thu, 20 May 2010)
New Revision: 19186
Trac: http://svn.gnucash.org/trac/changeset/19186

Added:
   gnucash/trunk/src/bin/gnucash.rc
Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/bin/Makefile.am
Log:
Bug #618647 - Compile .ico as resource into gnucash-bin.exe, patch by Tao Wang

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2010-05-20 08:34:50 UTC (rev 19185)
+++ gnucash/trunk/configure.ac	2010-05-20 13:25:33 UTC (rev 19186)
@@ -261,6 +261,7 @@
 		platform=win32
 		AC_MSG_RESULT($platform)
 		GNUCASH_ENVIRONMENT="environment-win32"
+		LT_PROG_RC
 
 		AC_MSG_CHECKING(for native win32)
 		case $host_os in

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2010-05-20 08:34:50 UTC (rev 19185)
+++ gnucash/trunk/src/bin/Makefile.am	2010-05-20 13:25:33 UTC (rev 19186)
@@ -17,8 +17,23 @@
   -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} \

Added: gnucash/trunk/src/bin/gnucash.rc
===================================================================
--- gnucash/trunk/src/bin/gnucash.rc	                        (rev 0)
+++ gnucash/trunk/src/bin/gnucash.rc	2010-05-20 13:25:33 UTC (rev 19186)
@@ -0,0 +1 @@
+APPLICATION_ICON    ICON          DISCARDABLE     "../pixmaps/gnucash-icon.ico"