[Scummvm-git-logs] scummvm master -> ab8b5273efbcccd66ebefd310bad0dcd5f826154

criezy criezy at scummvm.org
Sun Jul 2 23:13:27 CEST 2017


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

Summary:
ab8b5273ef BUILD: Add titanic.dat files to the list of engines data files


Commit: ab8b5273efbcccd66ebefd310bad0dcd5f826154
    https://github.com/scummvm/scummvm/commit/ab8b5273efbcccd66ebefd310bad0dcd5f826154
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-07-02T22:08:26+01:00

Commit Message:
BUILD: Add titanic.dat files to the list of engines data files

Changed paths:
    Makefile.common
    devtools/create_project/xcode.cpp
    dists/engine-data/README
    dists/redhat/scummvm.spec
    dists/scummvm.rc
    dists/scummvm.rc.in


diff --git a/Makefile.common b/Makefile.common
index dc1e0ad..10ba538 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -290,6 +290,9 @@ endif
 ifdef ENABLE_TEENAGENT
 DIST_FILES_ENGINEDATA+=teenagent.dat
 endif
+ifdef ENABLE_TITANIC
+DIST_FILES_ENGINEDATA+=titanic.dat
+endif
 ifdef ENABLE_TONY
 DIST_FILES_ENGINEDATA+=tony.dat
 endif
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 3925013..d60934b 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -676,6 +676,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
 		files.push_back("dists/engine-data/queen.tbl");
 		files.push_back("dists/engine-data/sky.cpt");
 		files.push_back("dists/engine-data/teenagent.dat");
+		files.push_back("dists/engine-data/titanic.dat");
 		files.push_back("dists/engine-data/tony.dat");
 		files.push_back("dists/engine-data/toon.dat");
 		files.push_back("dists/engine-data/wintermute.zip");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index e564b18..954bcbd 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -43,6 +43,9 @@ TODO
 teenagent.dat
 TODO
 
+titanic.dat
+TODO
+
 tony.dat:
 This file contains the font table used by the different versions of the game.
 
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 9e4b134..b2b821a 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -79,6 +79,7 @@ install -m644 -D dists/engine-data/queen.tbl %{buildroot}%{_datadir}/scummvm/que
 install -m644 -D dists/engine-data/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt
 install -m644 -D dists/engine-data/drascula.dat %{buildroot}%{_datadir}/scummvm/drascula.dat
 install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm/teenagent.dat
+install -m644 -D dists/engine-data/titanic.dat %{buildroot}%{_datadir}/scummvm/titanic.dat
 install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat
 install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat
 install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat
@@ -123,6 +124,7 @@ fi
 %{_datadir}/scummvm/lure.dat
 %{_datadir}/scummvm/drascula.dat
 %{_datadir}/scummvm/teenagent.dat
+%{_datadir}/scummvm/titanic.dat
 %{_datadir}/scummvm/hugo.dat
 %{_datadir}/scummvm/tony.dat
 %{_datadir}/scummvm/toon.dat
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index ee09f39..e926382 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -56,6 +56,9 @@ sky.cpt                FILE    "dists/engine-data/sky.cpt"
 #if ENABLE_TEENAGENT  == STATIC_PLUGIN
 teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
 #endif
+#if ENABLE_TITANIC    == STATIC_PLUGIN
+titanic.dat            FILE    "dists/engine-data/titanic.dat"
+#endif
 #if ENABLE_TONY       == STATIC_PLUGIN
 tony.dat               FILE    "dists/engine-data/tony.dat"
 #endif
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index e64fcaa..3aa95b3 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -56,6 +56,9 @@ sky.cpt                FILE    "dists/engine-data/sky.cpt"
 #if ENABLE_TEENAGENT  == STATIC_PLUGIN
 teenagent.dat          FILE    "dists/engine-data/teenagent.dat"
 #endif
+#if ENABLE_TITANIC    == STATIC_PLUGIN
+titanic.dat            FILE    "dists/engine-data/titanic.dat"
+#endif
 #if ENABLE_TONY       == STATIC_PLUGIN
 tony.dat               FILE    "dists/engine-data/tony.dat"
 #endif





More information about the Scummvm-git-logs mailing list