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

lotharsm mail at serra.me
Sun Feb 2 21:35:45 UTC 2020


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:
b25841e4ae BUILD: Add ultima.dat to the list of engine data files


Commit: b25841e4ae87d95546d92fe73bdb45a88e01cdf0
    https://github.com/scummvm/scummvm/commit/b25841e4ae87d95546d92fe73bdb45a88e01cdf0
Author: Lothar Serra Mari (mail at serra.me)
Date: 2020-02-02T22:35:20+01:00

Commit Message:
BUILD: Add ultima.dat to the list of engine data files

Changed paths:
    Makefile.common
    devtools/create_project/xcode.cpp
    dists/scummvm.rc


diff --git a/Makefile.common b/Makefile.common
index 3d2739f..1867d50 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -365,6 +365,9 @@ endif
 ifdef ENABLE_TOON
 DIST_FILES_ENGINEDATA+=toon.dat
 endif
+ifdef ENABLE_ULTIMA
+DIST_FILES_ENGINEDATA+=ultima.dat
+endif
 ifdef ENABLE_WINTERMUTE
 DIST_FILES_ENGINEDATA+=wintermute.zip
 endif
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index d91dfc7..0decb8b 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -786,6 +786,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
 		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/ultima.dat");
 		files.push_back("dists/engine-data/wintermute.zip");
 		files.push_back("dists/engine-data/macventure.dat");
 		files.push_back("dists/engine-data/xeen.ccs");
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 9dded88..b34cbd6 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -79,6 +79,9 @@ tony.dat               FILE    "dists/engine-data/tony.dat"
 #if PLUGIN_ENABLED_STATIC(TOON)
 toon.dat               FILE    "dists/engine-data/toon.dat"
 #endif
+#if PLUGIN_ENABLED_STATIC(ULTIMA)
+ultima.dat             FILE    "dists/engine-data/ultima.dat"
+#endif
 #if PLUGIN_ENABLED_STATIC(WINTERMUTE)
 wintermute.zip         FILE    "dists/engine-data/wintermute.zip"
 #endif




More information about the Scummvm-git-logs mailing list