From c69fadfa65beb12ec8fa65c06af9d7615380503b Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 12 Nov 2021 14:24:33 +0100 Subject: [PATCH] BUILD: Added gui-icons.dat to the list of redistributable files --- Makefile.common | 2 +- backends/platform/maemo/debian/rules | 2 +- devtools/create_project/xcode.cpp | 1 + dists/irix/scummvm.idb | 1 + dists/scummvm.rc | 1 + dists/win32/migration.txt | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 7317b4d3e20..ca4e64718ca 100644 --- a/Makefile.common +++ b/Makefile.common @@ -377,7 +377,7 @@ DIST_FILES_DOCS_no-nb:=$(addprefix $(srcdir)/doc/no-nb/,HurtigStart) DIST_FILES_DOCS_se:=$(addprefix $(srcdir)/doc/se/,LasMig Snabbstart) # Themes files -DIST_FILES_THEMES=scummmodern.zip scummclassic.zip scummremastered.zip residualvm.zip +DIST_FILES_THEMES=scummmodern.zip scummclassic.zip scummremastered.zip residualvm.zip gui-icons.dat ifdef USE_TRANSLATION DIST_FILES_THEMES+=translations.dat endif diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules index 1d4c0c8ee4a..c6912feb05f 100755 --- a/backends/platform/maemo/debian/rules +++ b/backends/platform/maemo/debian/rules @@ -44,7 +44,7 @@ install: build install -m0755 scummvm debian/scummvm/opt/scummvm/bin install -m0644 -d debian/scummvm/opt/scummvm/share install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share - install -m0644 gui/themes/scummclassic.zip gui/themes/scummmodern.zip gui/themes/scummremastered.zip debian/scummvm/opt/scummvm/share + install -m0644 gui/themes/scummclassic.zip gui/themes/scummmodern.zip gui/themes/scummremastered.zip gui/themes/gui-icons.dat debian/scummvm/opt/scummvm/share install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share # for optified version we can also add engine datafiles diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 32c74cf1401..0e896544083 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -828,6 +828,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const { files.push_back("gui/themes/scummmodern.zip"); files.push_back("gui/themes/scummremastered.zip"); files.push_back("gui/themes/residualvm.zip"); + files.push_back("gui/themes/gui-icons.dat"); files.push_back("gui/themes/translations.dat"); files.push_back("dists/engine-data/access.dat"); files.push_back("dists/engine-data/achievements.dat"); diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb index dbc34db01f4..48c9abccb6f 100644 --- a/dists/irix/scummvm.idb +++ b/dists/irix/scummvm.idb @@ -32,6 +32,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/xeen.ccs xeen.ccs scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/scummmodern.zip scummmodern.zip scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/scummremastered.zip scummremastered.zip scummvm.sw.eoe +f 0644 root sys usr/ScummVM/share/scummvm/gui-icons.dat gui-icons.dat scummvm.sw.eoe l 0000 root sys usr/bin/scummvm scummvm scummvm.sw.eoe symval(/usr/ScummVM/scummvm) f 0644 root sys usr/lib/filetype/local/ScummVM.ftr ScummVM.ftr scummvm.sw.eoe exitop('if test -r $rbase/usr/lib/filetype/Makefile ; then chroot $rbase /sbin/sh -c "cd /usr/lib/filetype ; make -u > /dev/null" ; fi') f 0644 root sys usr/lib/filetype/local/iconlib/ScummVM.fti ScummVM.fti scummvm.sw.eoe exitop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -add "Category:File Name:/usr/ScummVM/scummvm" -syspage Games; fi') removeop('if [ -x $rbase/usr/sbin/iconcatalogedit ]; then chroot $rbase /usr/sbin/iconcatalogedit -remove "Category:File Name:/usr/ScummVM/scummvm" -syspage Games; fi') diff --git a/dists/scummvm.rc b/dists/scummvm.rc index a5206a2f36e..91423e6747c 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -24,6 +24,7 @@ scummclassic.zip FILE "gui/themes/scummclassic.zip" scummmodern.zip FILE "gui/themes/scummmodern.zip" scummremastered.zip FILE "gui/themes/scummremastered.zip" residualvm.zip FILE "gui/themes/residualvm.zip" +gui-icons.dat FILE "gui/themes/gui-icons.dat" achievements.dat FILE "dists/engine-data/achievements.dat" encoding.dat FILE "dists/engine-data/encoding.dat" diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt index 005c6b1f067..61cad9aa76b 100644 --- a/dists/win32/migration.txt +++ b/dists/win32/migration.txt @@ -20,6 +20,7 @@ README.txt scummclassic.zip scummmodern.zip scummremastered.zip +gui-icons.dat scummvm.exe SDL2.dll sky.cpt