diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-01 04:07:11 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-01 04:07:11 +0000 |
| commit | a9e6d3699d6072adb28956bcc8e31ebd501618f8 (patch) | |
| tree | 89c92c8811f6811377a320bde29e56ac1211987b | |
| parent | 378b0cef0f72b3f761bfb3e8b1707d02d0d0eba9 (diff) | |
win32: added program icon.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@701 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/icons/Makefile.am | 1 | ||||
| -rw-r--r-- | src/icons/sylpheed.ico | bin | 0 -> 3638 bytes |
6 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2005-11-01 + + * src/icons/sylpheed.ico + src/icons/Makefile.am + src/Makefile.am + configure.in: win32: added program icon. + 2005-10-31 * libsylph/utils.c: execute_sync(): win32: get exit status of child diff --git a/ChangeLog.ja b/ChangeLog.ja index 9687a9dc..47b27687 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,10 @@ +2005-11-01 + + * src/icons/sylpheed.ico + src/icons/Makefile.am + src/Makefile.am + configure.in: win32: プログラムアイコンを追加。 + 2005-10-31 * libsylph/utils.c: execute_sync(): win32: ヘルパープログラムを使用 diff --git a/configure.in b/configure.in index 43b8135e..a2def06e 100644 --- a/configure.in +++ b/configure.in @@ -51,6 +51,9 @@ AM_PROG_LEX AC_PROG_YACC AM_PROG_LIBTOOL +AC_CHECK_PROG(WINDRES, windres, windres) +AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x) + SYLPHEED_ACLOCAL_INCLUDE(ac) native_win32=no diff --git a/src/Makefile.am b/src/Makefile.am index c3fafdb4..10c5d1b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,13 +105,24 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir)/libsylph +if HAVE_WINDRES +SYLPHEED_RES = sylpheed.res +sylpheed.rc: + echo "SYLPHEED ICON icons/sylpheed.ico" >$@ +sylpheed.res: sylpheed.rc + $(WINDRES) $< -O coff -o $@ +else +SYLPHEED_RES = +endif + sylpheed_LDADD = \ $(INTLLIBS) \ $(GTK_LIBS) \ $(GPGME_LIBS) \ $(LDAP_LIBS) \ $(LIBICONV) \ - ../libsylph/libsylph.la + ../libsylph/libsylph.la \ + $(SYLPHEED_RES) AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am index 3a4cca6c..e18cf8a8 100644 --- a/src/icons/Makefile.am +++ b/src/icons/Makefile.am @@ -68,6 +68,7 @@ EXTRA_DIST = \ ldap.xpm \ vcard.xpm \ mail.xpm \ + sylpheed.ico \ $(BUILT_SOURCES) %.h: %.png diff --git a/src/icons/sylpheed.ico b/src/icons/sylpheed.ico Binary files differnew file mode 100644 index 00000000..286f90ff --- /dev/null +++ b/src/icons/sylpheed.ico |