summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-04-21 15:44:39 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-04-21 15:44:39 +0000
commite980a6814bcc547f9435634f27856b48c70c9e26 (patch)
treee222858a84b6b8fcd084b74182cc8757e6f2ea8b
parentb77808cee0297abdc6d7077d7756f83f50fa5b3a (diff)
downloadnginx-e980a6814bcc547f9435634f27856b48c70c9e26.tar.gz
nginx-e980a6814bcc547f9435634f27856b48c70c9e26.tar.bz2
add 48x48 icon
-rw-r--r--misc/GNUmakefile9
-rw-r--r--src/os/win32/nginx.icobin518 -> 1350 bytes
-rw-r--r--src/os/win32/nginx_icon48.xpm55
3 files changed, 62 insertions, 2 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 99a62d5e8..58c371db3 100644
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -109,13 +109,17 @@ zip:
icons: src/os/win32/nginx.ico
-# 32x32 and 16x16 icons
+# 48x48, 32x32 and 16x16 icons
-src/os/win32/nginx.ico: src/os/win32/nginx_icon32.xpm \
+src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \
+ src/os/win32/nginx_icon32.xpm \
src/os/win32/nginx_icon16.xpm
test -d $(TEMP) || mkdir $(TEMP)
+ xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \
+ src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm
+
xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
@@ -123,5 +127,6 @@ src/os/win32/nginx.ico: src/os/win32/nginx_icon32.xpm \
src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
+ $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \
$(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
$(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm
diff --git a/src/os/win32/nginx.ico b/src/os/win32/nginx.ico
index af53a965c..70f79db1c 100644
--- a/src/os/win32/nginx.ico
+++ b/src/os/win32/nginx.ico
Binary files differ
diff --git a/src/os/win32/nginx_icon48.xpm b/src/os/win32/nginx_icon48.xpm
new file mode 100644
index 000000000..c25ba0f2f
--- /dev/null
+++ b/src/os/win32/nginx_icon48.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * nginx_xpm[] = {
+"48 48 2 2",
+/* colors */
+" c none",
+"GG c #009900",
+/* pixels */
+" ",
+" ",
+" ",
+" ",
+" ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
+" ",
+" ",
+" ",
+" ",
+" ",