From ab799101c034fe3c79d3b8134c35bd6ea3269568 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 14 Apr 2006 00:55:37 +0000
Subject: First batch of root directory cleanup. Now icons are stored in
directory icons/ and all other assorted stuff in dists/ directory. Still I
may broke some packaging/building procedures as no testing was performed.
svn-id: r21859
---
Makefile | 10 +-
backends/sdl/sdl.cpp | 2 +-
dists/debian/rules | 2 +-
dists/devcpp/scummvm.dev | 2 +-
dists/msevc4/scummvm/scummvm.vcp | 16 +--
dists/msvc6/scummvm.dsp | 2 +-
dists/msvc7/scummvm.vcproj | 2 +-
dists/msvc71/scummvm.vcproj | 2 +-
dists/msvc8/scummvm.vcproj | 2 +-
dists/redhat/scummvm.spec | 6 +-
dists/redhat/scummvm.spec.in | 6 +-
dists/scummvm.6 | 268 +++++++++++++++++++++++++++++++++++++
dists/scummvm.desktop | 12 ++
dists/slackware/scummvm.SlackBuild | 8 +-
icons/scummvm.icns | Bin 0 -> 51741 bytes
icons/scummvm.ico | Bin 0 -> 91198 bytes
icons/scummvm.xpm | 129 ++++++++++++++++++
scummvm.6 | 268 -------------------------------------
scummvm.desktop | 12 --
scummvm.icns | Bin 51741 -> 0 bytes
scummvm.ico | Bin 91198 -> 0 bytes
scummvm.rc | 2 +-
scummvm.rc.in | 2 +-
scummvm.xpm | 129 ------------------
24 files changed, 441 insertions(+), 441 deletions(-)
create mode 100644 dists/scummvm.6
create mode 100644 dists/scummvm.desktop
create mode 100644 icons/scummvm.icns
create mode 100644 icons/scummvm.ico
create mode 100644 icons/scummvm.xpm
delete mode 100644 scummvm.6
delete mode 100644 scummvm.desktop
delete mode 100644 scummvm.icns
delete mode 100644 scummvm.ico
delete mode 100644 scummvm.xpm
diff --git a/Makefile b/Makefile
index a9f69cf307..8cd643014f 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
- $(INSTALL) -c -m 644 "$(srcdir)/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
- $(INSTALL) -c -m 644 "$(srcdir)/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
@@ -56,8 +56,8 @@ uninstall:
rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
-scummvmico.o: scummvm.ico
- windres scummvm.rc scummvmico.o
+scummvmico.o: icons/scummvm.ico
+ windres dists/scummvm.rc icons/scummvmico.o
dist:
$(RM) $(ZIPFILE)
@@ -76,7 +76,7 @@ bundle: scummvm-static
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/
- cp $(srcdir)/scummvm.icns $(bundle_name)/Contents/Resources/
+ cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(srcdir)/gui/themes/default-theme.ini $(bundle_name)/Contents/Resources/
cp $(srcdir)/gui/themes/default-theme.zip $(bundle_name)/Contents/Resources/
cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 362f061a82..e8700ea00c 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -26,7 +26,7 @@
#include "common/util.h"
#include "base/main.h"
-#include "scummvm.xpm"
+#include "icons/scummvm.xpm"
#if defined(__amigaos4__)
// Set the stack cookie, 640 KB should be enough for everyone
diff --git a/dists/debian/rules b/dists/debian/rules
index 2c907f011a..42c2068239 100755
--- a/dists/debian/rules
+++ b/dists/debian/rules
@@ -28,7 +28,7 @@ install: build
dh_clean
dh_installdirs
install -m0755 scummvm debian/scummvm/usr/games/scummvm
- install -m0644 scummvm.xpm debian/scummvm/usr/share/icons
+ install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons
binary: binary-arch
diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev
index 236d2325d8..f8cdb45536 100644
--- a/dists/devcpp/scummvm.dev
+++ b/dists/devcpp/scummvm.dev
@@ -14,7 +14,7 @@ Compiler=
CppCompiler=-Wno-multichar_@@_-DUSE_ZLIB_@@_
Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_simon/simon.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lzdll_@@_
IsCpp=1
-Icon=scummvm.ico
+Icon=icons/scummvm.ico
ExeOutput=scummvm
ObjectOutput=scummvm
OverrideOutput=0
diff --git a/dists/msevc4/scummvm/scummvm.vcp b/dists/msevc4/scummvm/scummvm.vcp
index 0f6e3371ee..7e51c4d6a7 100644
--- a/dists/msevc4/scummvm/scummvm.vcp
+++ b/dists/msevc4/scummvm/scummvm.vcp
@@ -20124,7 +20124,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\stream.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
@@ -20177,7 +20177,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
"..\..\..\graphics\surface.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
{$(INCLUDE)}"SDL.h"\
{$(INCLUDE)}"SDL\begin_code.h"\
{$(INCLUDE)}"SDL\close_code.h"\
@@ -20228,7 +20228,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
@@ -20277,7 +20277,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\stream.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\compile.h"\
@@ -20327,7 +20327,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
@@ -20375,7 +20375,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
@@ -20422,7 +20422,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
@@ -20447,7 +20447,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\
"..\..\..\common\system.h"\
"..\..\..\common\util.h"\
- "..\..\..\scummvm.xpm"\
+ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\
diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp
index b3bf8ffc1d..b04886b2fa 100644
--- a/dists/msvc6/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -641,7 +641,7 @@ SOURCE=..\..\README
# End Source File
# Begin Source File
-SOURCE=..\..\scummvm.ico
+SOURCE=..\..\icons\scummvm.ico
# End Source File
# Begin Source File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index aed4fdf2f5..c323a3f4f5 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -446,7 +446,7 @@
Name="rsc"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ RelativePath="..\..\icons\scummvm.ico">
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index e8d39cf853..b48dbee0ec 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -460,7 +460,7 @@
Name="rsc"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ RelativePath="..\..\icons\scummvm.ico">
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 51ca8f4a3a..504ecd2b7b 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -682,7 +682,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
.
+ScummVM was written by the ScummVM team.
+See
+.Pa http://www.scummvm.org
+for more information.
diff --git a/dists/scummvm.desktop b/dists/scummvm.desktop
new file mode 100644
index 0000000000..5a0f88b355
--- /dev/null
+++ b/dists/scummvm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 866f89ba0d..579bb36e43 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -34,9 +34,9 @@ chmod 755 scummvm
mkdir -p $PKG/usr/bin
cp scummvm $PKG/usr/bin
chown -R root:bin $PKG/usr/bin
-gzip -9 scummvm.6
+gzip -9 dists/scummvm.6
mkdir -p $PKG/usr/man/man6
-cp scummvm.6.gz $PKG/usr/man/man6
+cp dists/scummvm.6.gz $PKG/usr/man/man6
mkdir -p $PKG/usr/doc/scummvm-$VERSION
cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
$PKG/usr/doc/scummvm-$VERSION
@@ -44,10 +44,10 @@ chmod 644 $PKG/usr/doc/scummvm-$VERSION
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
mkdir -p $PKG/usr/share/pixmaps
-cp -a scummvm.ico scummvm.xpm \
+cp -a icons/scummvm.ico icons/scummvm.xpm \
$PKG/usr/share/pixmaps
mkdir -p $PKG/usr/share/applications
-cp -a scummvm.desktop \
+cp -a dists/scummvm.desktop \
$PKG/usr/share/applications
cd $PKG
diff --git a/icons/scummvm.icns b/icons/scummvm.icns
new file mode 100644
index 0000000000..a6b49f3e90
Binary files /dev/null and b/icons/scummvm.icns differ
diff --git a/icons/scummvm.ico b/icons/scummvm.ico
new file mode 100644
index 0000000000..4408fcd017
Binary files /dev/null and b/icons/scummvm.ico differ
diff --git a/icons/scummvm.xpm b/icons/scummvm.xpm
new file mode 100644
index 0000000000..0768c0509d
--- /dev/null
+++ b/icons/scummvm.xpm
@@ -0,0 +1,129 @@
+/* XPM */
+static const char *scummvm_icon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 91 1",
+" c #070905",
+". c #0A0D09",
+"X c #0F110E",
+"o c #12140A",
+"O c #161A0C",
+"+ c #1B1F0B",
+"@ c #141911",
+"# c #181711",
+"$ c #1D1D17",
+"% c #1C260E",
+"& c #242F0D",
+"* c #202715",
+"= c #24241D",
+"- c #26350A",
+"; c #293A08",
+": c #333E0A",
+"> c #343C19",
+", c #303127",
+"< c #3D3C32",
+"1 c #284006",
+"2 c #324F03",
+"3 c #35480B",
+"4 c #3B5E03",
+"5 c #384329",
+"6 c #455810",
+"7 c #404E28",
+"8 c #495922",
+"9 c #4C680C",
+"0 c #4A7904",
+"q c #4F7F00",
+"w c #56750D",
+"e c #5A6831",
+"r c #657B3F",
+"t c #667B4E",
+"y c #4C8704",
+"u c #558F04",
+"i c #5B8904",
+"p c #5D9903",
+"a c #688D00",
+"s c #66821B",
+"d c #649707",
+"f c #669E00",
+"g c #67951B",
+"h c #779402",
+"j c #779F03",
+"k c #71990C",
+"l c #748F3F",
+"z c #7D9233",
+"x c #6BA909",
+"c c #71A30E",
+"v c #78A800",
+"b c #77B219",
+"n c #7FAA3A",
+"m c #7DB72F",
+"M c #7D9654",
+"N c #7FC700",
+"B c #8AA607",
+"V c #89AD1E",
+"C c #80B907",
+"Z c #88B407",
+"A c #8ABF00",
+"S c #90AC10",
+"D c #92B306",
+"F c #90BE00",
+"G c #97BE02",
+"H c #9EBE07",
+"J c #84BC29",
+"K c #91BD28",
+"L c #9EBF25",
+"P c #9EBA3E",
+"I c #A5BD0C",
+"U c #87A449",
+"Y c #8DBE47",
+"T c #98BF5E",
+"R c #9EBA5A",
+"E c #95B667",
+"W c #A2B756",
+"Q c #91CC00",
+"! c #9BCE0A",
+"~ c #95C01B",
+"^ c #8EC03A",
+"/ c #93E30E",
+"( c #A1C714",
+") c #A2C525",
+"_ c #AACB3B",
+"` c #A8E932",
+"' c #AED341",
+"] c #AFD769",
+"[ c #A6E041",
+"{ c #AEE45D",
+"} c None",
+/* pixels */
+"}}}}}}}}}}}}}}####$}}}}}}}}}}}}}",
+"}}}}}}}}}}# $}}}}}}}}}",
+"}}}}}}}}X . . . X}}}}}}}",
+"}}}}}}} . X .. . $}}}}}",
+"}}}}}}. .@5tMERRWUMe>@X. #<}}}",
+"}}}}}X 5M]{''______Ps3+.X .X}}",
+"}}}}} X5U{')(LI)L))_PVkq-X X}}",
+"}}}}X OU{[HCZDSSIILZVhvNx%XXX}}",
+"}}}}. .7[[(DZBjhkBBBBakb/i@X X}}",
+"}}}} .on`!A~DBjvkahaakcCN-XXXX}}",
+"}}}$ oJ`!FZ~DCNw:>:9sCNw#XXX}}}",
+"}}}$ @N/(GFGGCA9O #+:ig-XXX}}}}",
+"}}}} #b/QA~HHG(Bs6&#X&-@XX}}}}}",
+"}}}}. .q/!GAGLIF)IPWz8+XXXXX}}}}",
+"}}}}XX.-b!ZGGHHL)~)___k6O# X}}}}",
+"}}}}$ @4VDD~GLIHF~L_LKK9@XX}}}}",
+"}}}}}X O6kBvFD))~)L)LSZZ3XXX}}}",
+"}}}}}X X.@&wvVZZCL~)KKcjCa+XX}}}",
+"}}}}}X X$#X#-wcvbJKCCJfgdc&XX}}}",
+"}}}}X .=te*XXX&9cJJJJvcuiu1XX}}}",
+"}}}}X .5ETl7=@XXe^mKmfgqqq1XXX}}",
+"}}}X .XMT]Ymle55rYKmxuy00q&XXX}}",
+"}}} OnYJJJYYTTnmmbci00qq%XXX}}",
+"}}} X4fxbbbbmbmmmcggqq0q4OXXX}}",
+"}}} .1qppcfxxccpppyq00y0&XXX}}}",
+"}}} X-4qyuuuuuyy0yq0q03#X }}}",
+"}}}X O-400qqq0q00004-oXXX}}}}",
+"}}}}. &124494221&@ . <}}}}",
+"}}}}}} ..@OO%@X. . .X,}}}}}",
+"}}}}}}}# . .#,}}}}}}",
+"}}}}}}}}}}$X X$=}}}}}}}}",
+"}}}}}}}}}}}}}=$$$$==}}}}}}}}}}}}"
+};
diff --git a/scummvm.6 b/scummvm.6
deleted file mode 100644
index 859b9e2711..0000000000
--- a/scummvm.6
+++ /dev/null
@@ -1,268 +0,0 @@
-.\" $Id$
-.Dd December 15, 2004
-.Dt SCUMMVM 6
-.Os
-.Sh NAME
-.Nm scummvm
-.Nd graphic adventure game interpreter
-.Sh SYNOPSIS
-.Nm scummvm
-.Op Ar options
-.Op Ar game
-.Sh DESCRIPTION
-.Nm
-is an interpreter that will play graphic adventure games
-based an a variety of game engines.
-.Bl -tag -width Ds
-.It Fl F
-Force windowed mode.
-.It Fl b Ar param
-Pass number to the boot script (boot param).
-.It Fl c Ar config
-Use
-.Ar config
-as alternate configuration file.
-.It Fl d Ar level
-Set debug verbosity to
-.Ar level .
-.It Fl e Ar driver
-Music
-.Ar driver
-to use:
-.Bl -tag -width Ds
-.It Em adlib
-Adlib emulation (default)
-.It Em alsa
-Output using ALSA sequencer device
-.It Em amidi
-Use the MorphOS MIDI system, for MorphOS users
-.It Em core
-CoreAudio sound, for MacOS X users
-.It Em mt32
-MT-32 emulation
-.It Em null
-Null output.
-Don't play any music.
-.It Em pcjr
-PCjr emulation
-.It Em pcspk
-PC Speaker emulation
-.It Em qt
-Quicktime sound, for Macintosh users
-.It Em seq
-Use /dev/sequencer for MIDI output
-.It Em towns
-FM-TOWNS YM2612 emulation
-.It Em windows
-Windows built in MIDI sequencer for Windows users
-.El
-.It Fl f
-Force full-screen mode.
-.It Fl g Ar scaler
-Select graphics
-.Ar scaler :
-.Bl -tag -width Ds
-.It Em 2x
-No filtering, factor 2x (default for non 640x480 games).
-.It Em 3x
-No filtering, factor 3x.
-.It Em 2xsai
-2xsai filter, factor 2x.
-.It Em advmame2x
-Doesn't rely on blurring like 2xSAI, fast.
-Factor 2x.
-.It Em advmame3x
-Doesn't rely on blurring like 2xSAI, fast.
-Factor 3x.
-.It Em dotmatrix
-Dot matrix effect.
-Factor 2x.
-.It Em hq2x
-Very nice high quality filter but slow.
-Factor 2x.
-.It Em hq3x
-Very nice high quality filter but slow.
-Factor 3x.
-.It Em normal
-No filtering, no scaling.
-Fastest.
-.It Em super2xsai
-Enhanced 2xsai filtering, factor 2x.
-.It Em supereagle
-Less blurry than 2xsai, but slower.
-Factor 2x.
-.It Em tv2x
-Interlace filter, tries to emulate a TV.
-Factor 2x.
-.El
-.It Fl h
-Display a brief help text and exit.
-.It Fl m Ar vol
-Set the music volume to
-.Ar vol
-range 0-255 (default: 192).
-.It Fl n
-Enable subtitles (use with games that have voice).
-.It Fl p Ar path
-Path to where the game is installed.
-.It Fl q Ar language
-Select game language:
-.Bl -tag -width Ds
-.It Em cz
-Czech
-.It Em en
-English (USA) (default)
-.It Em de
-German
-.It Em es
-Spanish
-.It Em fr
-French
-.It Em gb
-English (Great Britain) (default for BASS)
-.It Em hb
-Hebrew
-.It Em it
-Italian
-.It Em jp
-Japanese
-.It Em kr
-Korean
-.It Em pt
-Portuguese
-.It Em ru
-Russian
-.It Em se
-Swedish
-.It Em zh
-Chinese
-.El
-.It Fl r Ar vol
-Set the speech volume to
-.Ar vol
-range 0-255 (default: 192).
-.It Fl s Ar vol
-Set the sfx volume to
-.Ar vol
-range 0-255 (default: 192).
-.It Fl t
-Display list of configured targets and exit.
-.It Fl u
-Enable script dumping if a directory called
-.Ql dumps
-exists in the current directory.
-.It Fl v
-Display ScummVM version information and exit.
-.It Fl x Ar slot
-Save game
-.Ar slot
-number to load (default: autosave).
-.It Fl z
-Display list of supported games and exit.
-.\" FIXME better way to do long options?
-.It Fl -alt-intro
-Use alternative intro for CD versions of Beneath a Steel Sky and
-Flight of the Amazon Queen.
-.It Fl -aspect-ratio
-Enable aspect ratio correction.
-.It Fl -cdrom= Ns Ar num
-CD drive to play CD audio from (default: 0 = first drive).
-.It Fl -copy-protection
-Enable copy protection in SCUMM games, when ScummVM disables it
-by default.
-.It Fl -demo-mode
-Start demo mode of Maniac Mansion.
-.It Fl -joystick= Ns Ar num
-Enable input with joystick (default: 0 = first joystick).
-.It Fl -multi-midi
-Enable combination Adlib and native MIDI.
-.It Fl -native-mt32
-True Roland MT-32 MIDI (disable GM emulation).
-.It Fl -output-rate= Ns Ar rate
-Set output sample rate in Hz to
-.Ar rate
-(e.g. 22050).
-.It Fl -platform= Ns Ar plat
-Specify original platform of game.
-.It Fl -savepath= Ns Ar path
-Look for savegames in
-.Ar path .
-.It Fl -talkspeed= Ns Ar speed
-Set talk speed to
-.Ar speed
-for SCUMM games (default: 60).
-.It Fl -tempo= Ns Ar tempo
-Set music tempo to
-.Ar tempo
-(in percent, 50-200) for SCUMM games (default: 100).
-.El
-.Sh INGAME KEYS
-.Bl -tag -width Ds
-.It Cmd-q
-Quit (Mac OS X)
-.It Ctrl-q
-Quit (Most platforms)
-.It Ctrl-f
-Toggle fast mode
-.It Ctrl-m
-Toggle mouse capture
-.It Ctrl-Alt 1-8
-Switch between graphics filters
-.It Ctrl-Alt +
-Increase scale factor
-.It Ctrl-Alt -
-Decrease scale factor
-.It Ctrl-Alt a
-Toggle aspect-ratio correction
-.It Alt-Enter
-Toggle full screen/windowed
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width SCUMMVM
-.It Ev SCUMMVM_SAVEPATH
-A writeable directory to read and write save games to and from.
-.It Ev SCUMMVM_MIDI
-The sequencer device to use with the
-.Ql seq
-MIDI driver.
-.It Ev SCUMMVM_MIDIPORT
-The number of the sequencer to use when using the
-.Ql seq
-MIDI driver.
-.It Ev SCUMMVM_PORT
-The ALSA port to open for output when using the
-.Ql alsa
-MIDI driver.
-.El
-.Sh FILES
-.Bl -tag -width Ds
-.It Pa $HOME/.scummvmrc
-Configuration file on UNIX.
-.It Pa "$HOME/Library/Preferences/ScummVM Preferences"
-Configuration file on Mac OS X.
-.El
-.Sh EXAMPLES
-Running the builtin game launcher:
-.Pp
-.Dl $ scummvm
-.Pp
-Running Day of the Tentacle specifying the path:
-.Pp
-.Dl $ scummvm -p /usr/local/share/games/tentacle tentacle
-.Pp
-Running The Dig with advmame2x filter with subtitles:
-.Pp
-.Dl $ scummvm -g advmame2x -n dig
-.Pp
-Running the Italian version of Maniac Mansion fullscreen:
-.Pp
-.Dl $ scummvm -q it -f maniac
-.Sh SEE ALSO
-More information can be found in the README and on the website
-.Pa http://www.scummvm.org .
-.Sh AUTHORS
-This manual page written by Jonathan Gray .
-ScummVM was written by the ScummVM team.
-See
-.Pa http://www.scummvm.org
-for more information.
diff --git a/scummvm.desktop b/scummvm.desktop
deleted file mode 100644
index 5a0f88b355..0000000000
--- a/scummvm.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=ScummVM
-Name[pl]=ScummVM
-Comment=Interpreter for several adventure games
-Comment[pl]=Interpreter graficznych gier przygodowych
-Exec=scummvm
-Icon=scummvm.xpm
-Terminal=false
-Type=Application
-Categories=Application;Game;AdventureGame;
-StartupNotify=false
diff --git a/scummvm.icns b/scummvm.icns
deleted file mode 100644
index a6b49f3e90..0000000000
Binary files a/scummvm.icns and /dev/null differ
diff --git a/scummvm.ico b/scummvm.ico
deleted file mode 100644
index 4408fcd017..0000000000
Binary files a/scummvm.ico and /dev/null differ
diff --git a/scummvm.rc b/scummvm.rc
index 3a498cd97b..a18e4bd76f 100644
--- a/scummvm.rc
+++ b/scummvm.rc
@@ -1,6 +1,6 @@
#include "winresrc.h"
-IDI_ICON ICON DISCARDABLE "scummvm.ico"
+IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,0,0
diff --git a/scummvm.rc.in b/scummvm.rc.in
index a2cc32bc73..6cc4818be0 100644
--- a/scummvm.rc.in
+++ b/scummvm.rc.in
@@ -1,6 +1,6 @@
#include "winresrc.h"
-IDI_ICON ICON DISCARDABLE "scummvm.ico"
+IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
diff --git a/scummvm.xpm b/scummvm.xpm
deleted file mode 100644
index 0768c0509d..0000000000
--- a/scummvm.xpm
+++ /dev/null
@@ -1,129 +0,0 @@
-/* XPM */
-static const char *scummvm_icon[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 91 1",
-" c #070905",
-". c #0A0D09",
-"X c #0F110E",
-"o c #12140A",
-"O c #161A0C",
-"+ c #1B1F0B",
-"@ c #141911",
-"# c #181711",
-"$ c #1D1D17",
-"% c #1C260E",
-"& c #242F0D",
-"* c #202715",
-"= c #24241D",
-"- c #26350A",
-"; c #293A08",
-": c #333E0A",
-"> c #343C19",
-", c #303127",
-"< c #3D3C32",
-"1 c #284006",
-"2 c #324F03",
-"3 c #35480B",
-"4 c #3B5E03",
-"5 c #384329",
-"6 c #455810",
-"7 c #404E28",
-"8 c #495922",
-"9 c #4C680C",
-"0 c #4A7904",
-"q c #4F7F00",
-"w c #56750D",
-"e c #5A6831",
-"r c #657B3F",
-"t c #667B4E",
-"y c #4C8704",
-"u c #558F04",
-"i c #5B8904",
-"p c #5D9903",
-"a c #688D00",
-"s c #66821B",
-"d c #649707",
-"f c #669E00",
-"g c #67951B",
-"h c #779402",
-"j c #779F03",
-"k c #71990C",
-"l c #748F3F",
-"z c #7D9233",
-"x c #6BA909",
-"c c #71A30E",
-"v c #78A800",
-"b c #77B219",
-"n c #7FAA3A",
-"m c #7DB72F",
-"M c #7D9654",
-"N c #7FC700",
-"B c #8AA607",
-"V c #89AD1E",
-"C c #80B907",
-"Z c #88B407",
-"A c #8ABF00",
-"S c #90AC10",
-"D c #92B306",
-"F c #90BE00",
-"G c #97BE02",
-"H c #9EBE07",
-"J c #84BC29",
-"K c #91BD28",
-"L c #9EBF25",
-"P c #9EBA3E",
-"I c #A5BD0C",
-"U c #87A449",
-"Y c #8DBE47",
-"T c #98BF5E",
-"R c #9EBA5A",
-"E c #95B667",
-"W c #A2B756",
-"Q c #91CC00",
-"! c #9BCE0A",
-"~ c #95C01B",
-"^ c #8EC03A",
-"/ c #93E30E",
-"( c #A1C714",
-") c #A2C525",
-"_ c #AACB3B",
-"` c #A8E932",
-"' c #AED341",
-"] c #AFD769",
-"[ c #A6E041",
-"{ c #AEE45D",
-"} c None",
-/* pixels */
-"}}}}}}}}}}}}}}####$}}}}}}}}}}}}}",
-"}}}}}}}}}}# $}}}}}}}}}",
-"}}}}}}}}X . . . X}}}}}}}",
-"}}}}}}} . X .. . $}}}}}",
-"}}}}}}. .@5tMERRWUMe>@X. #<}}}",
-"}}}}}X 5M]{''______Ps3+.X .X}}",
-"}}}}} X5U{')(LI)L))_PVkq-X X}}",
-"}}}}X OU{[HCZDSSIILZVhvNx%XXX}}",
-"}}}}. .7[[(DZBjhkBBBBakb/i@X X}}",
-"}}}} .on`!A~DBjvkahaakcCN-XXXX}}",
-"}}}$ oJ`!FZ~DCNw:>:9sCNw#XXX}}}",
-"}}}$ @N/(GFGGCA9O #+:ig-XXX}}}}",
-"}}}} #b/QA~HHG(Bs6&#X&-@XX}}}}}",
-"}}}}. .q/!GAGLIF)IPWz8+XXXXX}}}}",
-"}}}}XX.-b!ZGGHHL)~)___k6O# X}}}}",
-"}}}}$ @4VDD~GLIHF~L_LKK9@XX}}}}",
-"}}}}}X O6kBvFD))~)L)LSZZ3XXX}}}",
-"}}}}}X X.@&wvVZZCL~)KKcjCa+XX}}}",
-"}}}}}X X$#X#-wcvbJKCCJfgdc&XX}}}",
-"}}}}X .=te*XXX&9cJJJJvcuiu1XX}}}",
-"}}}}X .5ETl7=@XXe^mKmfgqqq1XXX}}",
-"}}}X .XMT]Ymle55rYKmxuy00q&XXX}}",
-"}}} OnYJJJYYTTnmmbci00qq%XXX}}",
-"}}} X4fxbbbbmbmmmcggqq0q4OXXX}}",
-"}}} .1qppcfxxccpppyq00y0&XXX}}}",
-"}}} X-4qyuuuuuyy0yq0q03#X }}}",
-"}}}X O-400qqq0q00004-oXXX}}}}",
-"}}}}. &124494221&@ . <}}}}",
-"}}}}}} ..@OO%@X. . .X,}}}}}",
-"}}}}}}}# . .#,}}}}}}",
-"}}}}}}}}}}$X X$=}}}}}}}}",
-"}}}}}}}}}}}}}=$$$$==}}}}}}}}}}}}"
-};
--
cgit v1.2.3