From bdd19bea778da1a35c4891ce4b9349d8c93294bf Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 23 Apr 2010 22:32:06 +0000 Subject: [PATCH] Write makefile rule to create gnucash-icon.ico. This rule isn't called by default though. It uses image-magick to add several png images of different size and bitdepth together. Current ico has: 16x16,8-bit 22x22,8-bit 24x24,8-bit 32x32,32-bit 48x48,32-bit 64x64,32-bit 96x96,32-bit 128x128,32-bit 256x256,32-bit git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19070 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/pixmaps/Makefile.am | 28 ++++++++++++++++++++-------- src/pixmaps/gnucash-icon.ico | Bin 175657 -> 175657 bytes 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index 99e8a6cc9a..471b10fcb4 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -38,11 +38,11 @@ gncpixmap_DATA = \ stock_split_title.png \ stock_split_watermark.png -gnclarge256icondir = ${datadir}/icons/hicolor/256x256/apps -gnclarge256icon_DATA = 256x256/gnucash-icon.png +gnchuge256icondir = ${datadir}/icons/hicolor/256x256/apps +gnchuge256icon_DATA = 256x256/gnucash-icon.png -gnclarge128icondir = ${datadir}/icons/hicolor/128x128/apps -gnclarge128icon_DATA = 128x128/gnucash-icon.png +gnchuge128icondir = ${datadir}/icons/hicolor/128x128/apps +gnchuge128icon_DATA = 128x128/gnucash-icon.png gnclarge96icondir = ${datadir}/icons/hicolor/96x96/apps gnclarge96icon_DATA = 96x96/gnucash-icon.png @@ -125,17 +125,23 @@ update-icon-cache: fi endif -EXTRA_DIST = \ - ${gncpixmap_DATA} \ +ico_files_hr = \ ${gnchuge256icon_DATA} \ ${gnchuge128icon_DATA} \ ${gnclarge96icon_DATA} \ ${gnclarge64icon_DATA} \ - ${gnclarge48icon_DATA} \ + ${gnclarge48icon_DATA} + +ico_files_lr = \ ${gncmediumicon_DATA} \ ${gncsmalltwfouricon_DATA} \ ${gncsmalltwtwoicon_DATA} \ - ${gncextrasmallicon_DATA} \ + ${gncextrasmallicon_DATA} + +EXTRA_DIST = \ + ${gncpixmap_DATA} \ + ${ico_files_hr} \ + ${ico_files_lr} \ ${gncscalableicon_DATA} # Only clean up if we're building from SVN @@ -143,3 +149,9 @@ if BUILDING_FROM_SVN clean-local: -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable endif + +# Create gnucash-icon.ico +.PHONY: ico +ico: ${ico_files_hr} ${ico_files_lr} + convert ${ico_files_lr} ${ico_files_hr} tmp.ico; \ + mv tmp.ico gnucash-icon.ico \ No newline at end of file diff --git a/src/pixmaps/gnucash-icon.ico b/src/pixmaps/gnucash-icon.ico index d8d9374e7e1a587d8065f31c3df26b4103576ae6..613260263e3bc382f78d06b92bf8dc025c2abc9e 100644 GIT binary patch delta 261 zcmZ2^hil~>u6hOrMg~p>1qBeTz_3Dqfngd01A~MFgx|r*z+flHz#t|D;R|puFdUO& zU=RSR1F6qoVPLqX1k?ZoAij4KP`x?>Lqh|Euff5{(7BRu6hOrMg~rXh6WI=z@Wjw$S{oo0ziE4CI*ImKrsUYi2Mpw1_sV3WXZhm595D!m-&&u!D2s HtR(^fT}wI)