diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-04-20 21:15:11 +0800 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-04-20 21:27:24 +0800 |
| commit | 74c9169a075d9edceb7d468b5026f5d285fcb370 (patch) | |
| tree | 13a3b3fc0ba9eea817cf54aadc148a735dd48a55 | |
| parent | afff9138fde1082ac7aa0b369481bcf7bffbf308 (diff) | |
| download | gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar.gz gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar.bz2 gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar.lz gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar.xz gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.tar.zst gsoc2013-evolution-74c9169a075d9edceb7d468b5026f5d285fcb370.zip | |
Give the windows version of evolution-alarm-notify a nice win32 icon
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 15 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc | 1 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/evolution-alarm-notify.ico | bin | 0 -> 290014 bytes | |||
| -rw-r--r-- | shell/Makefile.am | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 44e0187180..79b9122a3c 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -1,5 +1,9 @@ bin_PROGRAMS = evolution-alarm-notify +if HAVE_WINDRES +EVOLUTIONALARMNOTIFYICON = evolution-alarm-notify-icon.o +endif + evolution_alarm_notify_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ @@ -39,12 +43,19 @@ evolution_alarm_notify_LDADD = \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ $(CANBERRA_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(EVOLUTIONALARMNOTIFYICON) if OS_WIN32 evolution_alarm_notify_LDFLAGS = -mwindows endif -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) \ + evolution-alarm-notify-icon.rc \ + evolution-alarm-notify.ico + + +evolution-alarm-notify-icon.o: evolution-alarm-notify.ico evolution-alarm-notify-icon.rc + $(WINDRES) evolution-alarm-notify-icon.rc evolution-alarm-notify-icon.o -include $(top_srcdir)/git.mk diff --git a/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc b/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc new file mode 100644 index 0000000000..1f9ef65874 --- /dev/null +++ b/calendar/gui/alarm-notify/evolution-alarm-notify-icon.rc @@ -0,0 +1 @@ +1 ICON "evolution-alarm-notify.ico" diff --git a/calendar/gui/alarm-notify/evolution-alarm-notify.ico b/calendar/gui/alarm-notify/evolution-alarm-notify.ico Binary files differnew file mode 100644 index 0000000000..26e108d32d --- /dev/null +++ b/calendar/gui/alarm-notify/evolution-alarm-notify.ico diff --git a/shell/Makefile.am b/shell/Makefile.am index 0a93912680..7b742debae 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -87,7 +87,7 @@ libeshell_la_LIBADD = \ # Evolution executable if HAVE_WINDRES -EVOLUTIONICONRC = evolution-icon.o +EVOLUTIONICON = evolution-icon.o endif evolution_CPPFLAGS = \ @@ -131,7 +131,7 @@ evolution_LDADD = \ $(TZDIALOG_LIBS) \ $(SHELL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTIONICONRC) + $(EVOLUTIONICON) if OS_WIN32 evolution_LDFLAGS = -mwindows |