thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First batch of root directory cleanup. Now icons are stored in directory

Browse source 
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
This commit is contained in:
Eugene Sandulenko 2006-04-14 00:55:37 +00:00
parent 8dcf6ed006
commit ab799101c0
19 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -44,9 +44,9 @@ install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)" $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" $(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) -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) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(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 -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
scummvmico.o: scummvm.ico scummvmico.o: icons/scummvm.ico
windres scummvm.rc scummvmico.o windres dists/scummvm.rc icons/scummvmico.o
dist: dist:
$(RM) $(ZIPFILE) $(RM) $(ZIPFILE)
@ -76,7 +76,7 @@ bundle: scummvm-static
mkdir -p $(bundle_name)/Contents/Resources mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo echo "APPL????" > $(bundle_name)/Contents/PkgInfo
cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/ 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.ini $(bundle_name)/Contents/Resources/
cp $(srcdir)/gui/themes/default-theme.zip $(bundle_name)/Contents/Resources/ cp $(srcdir)/gui/themes/default-theme.zip $(bundle_name)/Contents/Resources/
cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm

2
backends/sdl/sdl.cpp
View file

@ -26,7 +26,7 @@
#include "common/util.h" #include "common/util.h"
#include "base/main.h" #include "base/main.h"
#include "scummvm.xpm" #include "icons/scummvm.xpm"
#if defined(__amigaos4__) #if defined(__amigaos4__)
// Set the stack cookie, 640 KB should be enough for everyone // Set the stack cookie, 640 KB should be enough for everyone

2
dists/debian/rules
View file

@ -28,7 +28,7 @@ install: build
dh_clean dh_clean
dh_installdirs dh_installdirs
install -m0755 scummvm debian/scummvm/usr/games/scummvm 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 binary: binary-arch

2
dists/devcpp/scummvm.dev
View file

@ -14,7 +14,7 @@ Compiler=
CppCompiler=-Wno-multichar_@@_-DUSE_ZLIB_@@_ 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_@@_ 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 IsCpp=1
Icon=scummvm.ico Icon=icons/scummvm.ico
ExeOutput=scummvm ExeOutput=scummvm
ObjectOutput=scummvm ObjectOutput=scummvm
OverrideOutput=0 OverrideOutput=0

16
dists/msevc4/scummvm/scummvm.vcp
View file

@ -20124,7 +20124,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\stream.h"\ "..\..\..\common\stream.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\
@ -20177,7 +20177,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\graphics\surface.h"\ "..\..\..\graphics\surface.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
{$(INCLUDE)}"SDL.h"\ {$(INCLUDE)}"SDL.h"\
{$(INCLUDE)}"SDL\begin_code.h"\ {$(INCLUDE)}"SDL\begin_code.h"\
{$(INCLUDE)}"SDL\close_code.h"\ {$(INCLUDE)}"SDL\close_code.h"\
@ -20228,7 +20228,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\ "..\..\..\common\str.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\
@ -20277,7 +20277,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\stream.h"\ "..\..\..\common\stream.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\compile.h"\ "..\..\..\common\compile.h"\
@ -20327,7 +20327,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\ "..\..\..\common\str.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\
@ -20375,7 +20375,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\ "..\..\..\common\str.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\
@ -20422,7 +20422,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\ "..\..\..\common\str.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\
@ -20447,7 +20447,7 @@ DEP_CPP_SDL_C=\
"..\..\..\common\str.h"\ "..\..\..\common\str.h"\
"..\..\..\common\system.h"\ "..\..\..\common\system.h"\
"..\..\..\common\util.h"\ "..\..\..\common\util.h"\
"..\..\..\scummvm.xpm"\ "..\..\..\icons\scummvm.xpm"\
NODEP_CPP_SDL_C=\ NODEP_CPP_SDL_C=\
"..\..\..\common\extend.h"\ "..\..\..\common\extend.h"\

2
dists/msvc6/scummvm.dsp
View file

@ -641,7 +641,7 @@ SOURCE=..\..\README
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\scummvm.ico SOURCE=..\..\icons\scummvm.ico
# End Source File # End Source File
# Begin Source File # Begin Source File

2
dists/msvc7/scummvm.vcproj
View file

@ -446,7 +446,7 @@
Name="rsc" Name="rsc"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File <File
RelativePath="..\..\scummvm.ico"> RelativePath="..\..\icons\scummvm.ico">
</File> </File>
<File <File
RelativePath="..\..\scummvm.rc"> RelativePath="..\..\scummvm.rc">

2
dists/msvc71/scummvm.vcproj
View file

@ -460,7 +460,7 @@
Name="rsc" Name="rsc"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File <File
RelativePath="..\..\scummvm.ico"> RelativePath="..\..\icons\scummvm.ico">
</File> </File>
<File <File
RelativePath="..\..\scummvm.rc"> RelativePath="..\..\scummvm.rc">

2
dists/msvc8/scummvm.vcproj
View file

@ -682,7 +682,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
> >
<File <File
RelativePath="..\..\scummvm.ico" RelativePath="..\..\icons\scummvm.ico"
> >
</File> </File>
<File <File

6
dists/redhat/scummvm.spec
View file

@ -54,9 +54,9 @@ make
%install %install
install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
%clean %clean
rm -Rf ${RPM_BUILD_ROOT} rm -Rf ${RPM_BUILD_ROOT}

6
dists/redhat/scummvm.spec.in
View file

@ -54,9 +54,9 @@ make
%install %install
install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
%clean %clean
rm -Rf ${RPM_BUILD_ROOT} rm -Rf ${RPM_BUILD_ROOT}

0
scummvm.6 → dists/scummvm.6
View file

0
scummvm.desktop → dists/scummvm.desktop
View file

8
dists/slackware/scummvm.SlackBuild
View file

@ -34,9 +34,9 @@ chmod 755 scummvm
mkdir -p $PKG/usr/bin mkdir -p $PKG/usr/bin
cp scummvm $PKG/usr/bin cp scummvm $PKG/usr/bin
chown -R root:bin $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 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 mkdir -p $PKG/usr/doc/scummvm-$VERSION
cp -a AUTHORS COPYING ChangeLog NEWS README TODO \ cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
$PKG/usr/doc/scummvm-$VERSION $PKG/usr/doc/scummvm-$VERSION
@ -44,10 +44,10 @@ chmod 644 $PKG/usr/doc/scummvm-$VERSION
mkdir -p $PKG/install mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/slack-desc > $PKG/install/slack-desc
mkdir -p $PKG/usr/share/pixmaps mkdir -p $PKG/usr/share/pixmaps
cp -a scummvm.ico scummvm.xpm \ cp -a icons/scummvm.ico icons/scummvm.xpm \
$PKG/usr/share/pixmaps $PKG/usr/share/pixmaps
mkdir -p $PKG/usr/share/applications mkdir -p $PKG/usr/share/applications
cp -a scummvm.desktop \ cp -a dists/scummvm.desktop \
$PKG/usr/share/applications $PKG/usr/share/applications
cd $PKG cd $PKG

0
scummvm.icns → icons/scummvm.icns
View file

0
scummvm.ico → icons/scummvm.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB

Before After
Before After

0
scummvm.xpm → icons/scummvm.xpm
View file

2
scummvm.rc
View file

@ -1,6 +1,6 @@
#include "winresrc.h" #include "winresrc.h"
IDI_ICON ICON DISCARDABLE "scummvm.ico" IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,0,0 FILEVERSION 0,9,0,0

2
scummvm.rc.in
View file

@ -1,6 +1,6 @@
#include "winresrc.h" #include "winresrc.h"
IDI_ICON ICON DISCARDABLE "scummvm.ico" IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0