[Scummvm-git-logs] scummvm branch-2-7 -> 0d365743ff5a635196f91289e10944e0d8220371

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6c4d9db70f DISTS: Added classicmacfonts.dat
0d365743ff DISTS: Sync dists/win32/migration.txt with master


Commit: 6c4d9db70feee0ae78225dc181bd155995ef1bb7
    https://github.com/scummvm/scummvm/commit/6c4d9db70feee0ae78225dc181bd155995ef1bb7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-05T14:06:09+02:00

Commit Message:
DISTS: Added classicmacfonts.dat

This file contains fonts used for recreation of Classic Mac OS GUI. To generate it,
use the following commnand:

  devtools/dumper-companion.py createmacfonts

Changed paths:
  A dists/engine-data/classicmacfonts.dat
    Makefile.common
    dists/engine-data/README
    dists/irix/scummvm.idb
    dists/scummvm.rc
    dists/win32/migration.txt


diff --git a/Makefile.common b/Makefile.common
index bca64b067eb..e29af26ce42 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -473,7 +473,6 @@ endif
 ifdef USE_FREETYPE2
 DIST_FILES_ENGINEDATA+=fonts.dat
 endif
-DIST_FILES_ENGINEDATA+=macgui.dat
 ifdef ENABLE_GRIM
 DIST_FILES_ENGINEDATA+=grim-patch.lab
 endif
@@ -484,7 +483,9 @@ ifdef ENABLE_MYST3
 DIST_FILES_ENGINEDATA+=myst3.dat
 endif
 DIST_FILES_ENGINEDATA+=achievements.dat
+DIST_FILES_ENGINEDATA+=classicmacfonts.dat
 DIST_FILES_ENGINEDATA+=encoding.dat
+DIST_FILES_ENGINEDATA+=macgui.dat
 DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA))
 
 # pred.dic is currently only used for the AGI engine
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 9d02f2d0644..5dd6ef637f0 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -7,6 +7,12 @@ This file contains game resource data used by Access engine.
 achievements.dat:
 This file contains Achievements and Statistics IDs and localization from Steam and GOG.
 
+classicmacfonts.dat:
+This file contains fonts used for recreation of Classic Mac OS GUI. To generate it,
+use the following commnand:
+
+  devtools/dumper-companion.py createmacfonts
+
 cryo.dat:
 This file contains a lot of hardcoded tables used by the Cryo engine.
 
diff --git a/dists/engine-data/classicmacfonts.dat b/dists/engine-data/classicmacfonts.dat
new file mode 100644
index 00000000000..bf0c3e75fc0
Binary files /dev/null and b/dists/engine-data/classicmacfonts.dat differ
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index 86800452485..1f2a692695a 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -16,6 +16,7 @@ f 0755 root sys usr/ScummVM/scummvm scummvm scummvm.sw.eoe tag('0x5260dbec')
 f 0644 root sys usr/ScummVM/share/pixmaps/scummvm.xpm scummvm.xpm scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/access.dat access.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/achievements.dat achievements.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/classicmacfonts.dat classicmacfonts.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/cryo.dat cryo.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/cryomni3d.dat cryomni3d.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index a46c1beb279..1d9ecc679c0 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -28,6 +28,8 @@ gui-icons.dat          FILE    "gui/themes/gui-icons.dat"
 shaders.dat            FILE    "gui/themes/shaders.dat"
 achievements.dat       FILE    "dists/engine-data/achievements.dat"
 encoding.dat           FILE    "dists/engine-data/encoding.dat"
+macgui.dat             FILE    "dists/engine-data/macgui.dat"
+classicmacfonts.dat    FILE    "dists/engine-data/classicmacfonts.dat"
 
 // Engine or feature specific resources
 #ifdef BUILTIN_RESOURCES
@@ -50,7 +52,6 @@ wwwroot.zip            FILE    "dists/networking/wwwroot.zip"
 #ifdef USE_FREETYPE2
 fonts.dat              FILE    "dists/engine-data/fonts.dat"
 #endif
-macgui.dat             FILE    "dists/engine-data/macgui.dat"
 
 #if PLUGIN_ENABLED_STATIC(ACCESS)
 access.dat             FILE    "dists/engine-data/access.dat"
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index 00fe4d99a16..aa12a67392c 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -10,6 +10,7 @@ COPYING.TINYGL
 COPYING.GLAD
 COPYING.txt
 COPYRIGHT.txt
+classicmacfonts.dat
 drascula.dat
 freescape.dat
 hadesch_translations.dat


Commit: 0d365743ff5a635196f91289e10944e0d8220371
    https://github.com/scummvm/scummvm/commit/0d365743ff5a635196f91289e10944e0d8220371
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-07-05T14:06:33+02:00

Commit Message:
DISTS: Sync dists/win32/migration.txt with master

Changed paths:
    dists/win32/migration.txt


diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index aa12a67392c..d0824f99c7f 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -10,9 +10,17 @@ COPYING.TINYGL
 COPYING.GLAD
 COPYING.txt
 COPYRIGHT.txt
+access.dat
+achievements.dat
 classicmacfonts.dat
+cryo.dat
+cryomni3d.dat
 drascula.dat
+encoding.dat
+fonts.dat
 freescape.dat
+grim-patch.lab
+gui-icons.dat
 hadesch_translations.dat
 hugo.dat
 kyra.dat