From 7dbc61325826f18412953780acb6ab67838d1519 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Sun, 9 Dec 2018 13:10:39 +0000 Subject: BUILD: Add fonts.dat to packaging rules --- Makefile.common | 3 +++ backends/platform/maemo/debian/rules | 1 + backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg | 1 + backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg | 1 + backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg | 1 + backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg | 1 + devtools/create_project/xcode.cpp | 1 + dists/irix/scummvm.idb | 1 + dists/scummvm.rc | 6 +++--- 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index 3aebc582c4..47091e65df 100644 --- a/Makefile.common +++ b/Makefile.common @@ -334,6 +334,9 @@ endif ifdef ENABLE_XEEN DIST_FILES_ENGINEDATA+=xeen.ccs endif +ifdef USE_FREETYPE2 +DIST_FILES_ENGINEDATA+=fonts.dat +endif DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA)) # pred.dic is currently only used for the AGI engine diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules index 0e72c8aa9a..eef1d0e21a 100755 --- a/backends/platform/maemo/debian/rules +++ b/backends/platform/maemo/debian/rules @@ -50,6 +50,7 @@ install: build # for optified version we can also add engine datafiles install -m0644 dists/engine-data/access.dat debian/scummvm/opt/scummvm/share install -m0644 dists/engine-data/drascula.dat debian/scummvm/opt/scummvm/share + install -m0644 dists/engine-data/fonts.dat debian/scummvm/opt/scummvm/share install -m0644 dists/engine-data/hugo.dat debian/scummvm/opt/scummvm/share install -m0644 dists/engine-data/kyra.dat debian/scummvm/opt/scummvm/share install -m0644 dists/engine-data/lure.dat debian/scummvm/opt/scummvm/share diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index 7dc58f4a61..08a9e517ea 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -62,6 +62,7 @@ ; Common datafiles needed for some games "..\..\..\..\dists\engine-data\drascula.dat"-"c:\data\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\fonts.dat"-"c:\data\scummvm\fonts.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\data\scummvm\hugo.dat" "..\..\..\..\dists\engine-data\kyra.dat"-"c:\data\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\data\scummvm\lure.dat" diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg index 8c953d30ea..39239fbe33 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg @@ -67,6 +67,7 @@ ; Common datafiles needed for some games "..\..\..\..\dists\engine-data\drascula.dat"-"c:\data\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\fonts.dat"-"c:\data\scummvm\fonts.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\data\scummvm\hugo.dat" "..\..\..\..\dists\engine-data\kyra.dat"-"c:\data\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\data\scummvm\lure.dat" diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index adb869f078..452fcb8630 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -60,6 +60,7 @@ ; Common datafiles needed for some games "..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\fonts.dat"-"c:\shared\scummvm\fonts.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat" "..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat" diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg index 528e39adee..44596a1fc7 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg @@ -68,6 +68,7 @@ ; Common datafiles needed for some games "..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\fonts.dat"-"c:\shared\scummvm\fonts.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat" "..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat" diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index ed6baf6963..7fe2aa6107 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -757,6 +757,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const { files.push_back("dists/engine-data/access.dat"); files.push_back("dists/engine-data/cryo.dat"); files.push_back("dists/engine-data/drascula.dat"); + files.push_back("dists/engine-data/fonts.dat"); files.push_back("dists/engine-data/hugo.dat"); files.push_back("dists/engine-data/kyra.dat"); files.push_back("dists/engine-data/lure.dat"); diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb index cfd9463107..691792b97d 100644 --- a/dists/irix/scummvm.idb +++ b/dists/irix/scummvm.idb @@ -6,6 +6,7 @@ f 0644 root sys usr/ScummVM/README README scummvm.man.readme 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/drascula.dat drascula.dat scummvm.sw.eoe +f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/lure.dat lure.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe diff --git a/dists/scummvm.rc b/dists/scummvm.rc index fb45f42680..ea99e5f699 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -24,6 +24,9 @@ translations.dat FILE "gui/themes/translations.dat" #ifdef USE_SDL_NET wwwroot.zip FILE "dists/networking/wwwroot.zip" #endif +#ifdef USE_FREETYPE2 +fonts.dat FILE "dists/engine-data/fonts.dat" +#endif #if ENABLE_ACCESS == STATIC_PLUGIN access.dat FILE "dists/engine-data/access.dat" @@ -34,9 +37,6 @@ cryo.dat FILE "dists/engine-data/cryo.dat" #if ENABLE_DRASCULA == STATIC_PLUGIN drascula.dat FILE "dists/engine-data/drascula.dat" #endif -#if ENABLE_GLK == STATIC_PLUGIN -fonts.dat FILE "dists/engine-data/fonts.dat" -#endif #if ENABLE_HUGO == STATIC_PLUGIN hugo.dat FILE "dists/engine-data/hugo.dat" #endif -- cgit v1.2.3