aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile10
-rw-r--r--backends/sdl/sdl.cpp2
-rwxr-xr-xdists/debian/rules2
-rw-r--r--dists/devcpp/scummvm.dev2
-rw-r--r--dists/msevc4/scummvm/scummvm.vcp16
-rw-r--r--dists/msvc6/scummvm.dsp2
-rw-r--r--dists/msvc7/scummvm.vcproj2
-rw-r--r--dists/msvc71/scummvm.vcproj2
-rw-r--r--dists/msvc8/scummvm.vcproj2
-rw-r--r--dists/redhat/scummvm.spec6
-rw-r--r--dists/redhat/scummvm.spec.in6
-rw-r--r--dists/scummvm.6 (renamed from scummvm.6)0
-rw-r--r--dists/scummvm.desktop (renamed from scummvm.desktop)0
-rwxr-xr-xdists/slackware/scummvm.SlackBuild8
-rw-r--r--icons/scummvm.icns (renamed from scummvm.icns)bin51741 -> 51741 bytes
-rw-r--r--icons/scummvm.ico (renamed from scummvm.ico)bin91198 -> 91198 bytes
-rw-r--r--icons/scummvm.xpm (renamed from scummvm.xpm)0
-rw-r--r--scummvm.rc2
-rw-r--r--scummvm.rc.in2
19 files changed, 32 insertions, 32 deletions
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">
<File
- RelativePath="..\..\scummvm.ico">
+ RelativePath="..\..\icons\scummvm.ico">
</File>
<File
RelativePath="..\..\scummvm.rc">
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">
<File
- RelativePath="..\..\scummvm.ico">
+ RelativePath="..\..\icons\scummvm.ico">
</File>
<File
RelativePath="..\..\scummvm.rc">
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"
>
<File
- RelativePath="..\..\scummvm.ico"
+ RelativePath="..\..\icons\scummvm.ico"
>
</File>
<File
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 1bd65089a3..aed6013dea 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -54,9 +54,9 @@ make
%install
install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
-install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
-install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
-desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop
+install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
+install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
+desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
%clean
rm -Rf ${RPM_BUILD_ROOT}
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index cbe47ec414..7828cb5dcb 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -54,9 +54,9 @@ make
%install
install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
-install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
-install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
-desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop
+install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
+install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
+desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
%clean
rm -Rf ${RPM_BUILD_ROOT}
diff --git a/scummvm.6 b/dists/scummvm.6
index 859b9e2711..859b9e2711 100644
--- a/scummvm.6
+++ b/dists/scummvm.6
diff --git a/scummvm.desktop b/dists/scummvm.desktop
index 5a0f88b355..5a0f88b355 100644
--- a/scummvm.desktop
+++ b/dists/scummvm.desktop
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/scummvm.icns b/icons/scummvm.icns
index a6b49f3e90..a6b49f3e90 100644
--- a/scummvm.icns
+++ b/icons/scummvm.icns
Binary files differ
diff --git a/scummvm.ico b/icons/scummvm.ico
index 4408fcd017..4408fcd017 100644
--- a/scummvm.ico
+++ b/icons/scummvm.ico
Binary files differ
diff --git a/scummvm.xpm b/icons/scummvm.xpm
index 0768c0509d..0768c0509d 100644
--- a/scummvm.xpm
+++ b/icons/scummvm.xpm
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:19:06 +0000