Added PNG file, which is the standard icon format defined by

freedesktop.org.  The XPM is still present, and is used for compiling
directly into the application.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1331 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-07-25 13:07:15 +00:00
parent 2ff9f25576
commit c399392dfe
4 changed files with 13 additions and 15 deletions

View File

@ -13,7 +13,7 @@
## See the file "license" for information on usage and redistribution of ## See the file "license" for information on usage and redistribution of
## this file, and for a DISCLAIMER OF ALL WARRANTIES. ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
## ##
## $Id: Makefile,v 1.30 2006-12-20 20:36:25 stephena Exp $ ## $Id: Makefile,v 1.31 2007-07-25 13:07:15 stephena Exp $
## ##
## Based on code from ScummVM - Scumm Interpreter ## Based on code from ScummVM - Scumm Interpreter
## Copyright (C) 2002-2004 The ScummVM project ## Copyright (C) 2002-2004 The ScummVM project
@ -179,9 +179,9 @@ install: all
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons" $(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/mini" $(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/mini"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/large" $(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/large"
$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons" $(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons"
$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/mini" $(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons/mini"
$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/large" $(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons/large"
install-strip: install install-strip: install
strip stella$(EXEEXT) strip stella$(EXEEXT)
@ -190,9 +190,9 @@ uninstall:
rm -f "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" rm -f "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
rm -rf "$(DESTDIR)$(DOCDIR)/" rm -rf "$(DESTDIR)$(DOCDIR)/"
rm -f "$(DESTDIR)$(DATADIR)/applications/stella.desktop" rm -f "$(DESTDIR)$(DATADIR)/applications/stella.desktop"
rm -f "$(DESTDIR)$(DATADIR)/icons/stella.xpm" rm -f "$(DESTDIR)$(DATADIR)/icons/stella.png"
rm -f "$(DESTDIR)$(DATADIR)/icons/mini/stella.xpm" rm -f "$(DESTDIR)$(DATADIR)/icons/mini/stella.png"
rm -f "$(DESTDIR)$(DATADIR)/icons/large/stella.xpm" rm -f "$(DESTDIR)$(DATADIR)/icons/large/stella.png"
# Special rule for Win32 icon stuff (there's probably a better way to do this ...) # Special rule for Win32 icon stuff (there's probably a better way to do this ...)
src/win32/stella_icon.o: src/win32/stella.ico src/win32/stella.rc src/win32/stella_icon.o: src/win32/stella.ico src/win32/stella.rc

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

View File

@ -3,7 +3,7 @@ Encoding=UTF-8
Name=Stella Name=Stella
Comment=A multi-platform Atari 2600 emulator Comment=A multi-platform Atari 2600 emulator
Exec=stella Exec=stella
Icon=stella.xpm Icon=stella.png
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Application;Emulator;Game; Categories=Application;Emulator;Game;

View File

@ -27,9 +27,7 @@ License: GPL
URL: http://stella.sourceforge.net URL: http://stella.sourceforge.net
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
BuildRoot: %_tmppath/%name-%version-%release-root BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: SDL-devel BuildRequires: SDL-devel MesaGLU-devel zlib-devel
BuildRequires: MesaGLU-devel
BuildRequires: zlib-devel
%description %description
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most
@ -90,7 +88,7 @@ make install-strip DESTDIR=%{buildroot}
install -d -m0755 %{buildroot}%{_menudir} install -d -m0755 %{buildroot}%{_menudir}
cat > %{buildroot}%{_menudir}/%{name} << EOF cat > %{buildroot}%{_menudir}/%{name} << EOF
?package(%{name}): command="stella" \ ?package(%{name}): command="stella" \
icon="stella.xpm" \ icon="stella.png" \
needs="x11" \ needs="x11" \
title="Stella" \ title="Stella" \
longtitle="A multi-platform Atari 2600 emulator" \ longtitle="A multi-platform Atari 2600 emulator" \
@ -114,9 +112,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%{_menudir}/%{name} %{_menudir}/%{name}
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%_docdir/stella/* %_docdir/stella/*
%_datadir/icons/%{name}.xpm %_datadir/icons/%{name}.png
%_datadir/icons/mini/%{name}.xpm %_datadir/icons/mini/%{name}.png
%_datadir/icons/large/%{name}.xpm %_datadir/icons/large/%{name}.png
%changelog %changelog
* Fri Dec 22 2006 Stephen Anthony <stephena@zarb.org> 2.3-1plf2007.0 * Fri Dec 22 2006 Stephen Anthony <stephena@zarb.org> 2.3-1plf2007.0