mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ken Cunningham
9a45822f5c
- scummvm updates to 2.7.1 - scummvm-devel to current commit - a few patches have been incorporated upstream,sometimes in slightly different formats to similar effect. - one plugin fails to link libfreetype unless manually added
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
diff --git base/version.cpp base/version.cpp
|
|
index 70ca120a..0a2178ea 100644
|
|
--- base/version.cpp
|
|
+++ base/version.cpp
|
|
@@ -58,8 +58,7 @@ const char gScummVMVersion[] = SCUMMVM_VERSION SCUMMVM_REVISION;
|
|
#if defined(__amigaos4__) || defined(__MORPHOS__)
|
|
static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
|
|
#endif
|
|
-const char gScummVMBuildDate[] = __DATE__ " " __TIME__;
|
|
-const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
|
|
+const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION;
|
|
const char gScummVMCompiler[] = ""
|
|
#define STR_HELPER(x) #x
|
|
#define STR(x) STR_HELPER(x)
|
|
@@ -77,7 +76,7 @@ const char gScummVMCompiler[] = ""
|
|
#undef STR
|
|
#undef STR_HELPER
|
|
;
|
|
-const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
|
|
+const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
|
|
const char gScummVMFeatures[] = ""
|
|
#ifdef TAINTED_BUILD
|
|
// TAINTED means the build contains engines/subengines not enabled by default
|
|
diff --git base/version.h base/version.h
|
|
index 657a703f..2fd08537 100644
|
|
--- base/version.h
|
|
+++ base/version.h
|
|
@@ -23,7 +23,6 @@
|
|
#define BASE_VERSION_H
|
|
|
|
extern const char gScummVMVersion[]; // e.g. "0.4.1"
|
|
-extern const char gScummVMBuildDate[]; // e.g. "2003-06-24"
|
|
extern const char gScummVMVersionDate[]; // e.g. "0.4.1 (2003-06-24)"
|
|
extern const char gScummVMCompiler[]; // e.g. "GCC 11.2.0"
|
|
extern const char gScummVMFullVersion[]; // e.g. "ScummVM 0.4.1 (2003-06-24)"
|
|
diff --git gui/about.cpp gui/about.cpp
|
|
index 0af3e31c..d4ed4614 100644
|
|
--- gui/about.cpp
|
|
+++ gui/about.cpp
|
|
@@ -100,7 +100,7 @@ AboutDialog::AboutDialog()
|
|
addLine(version);
|
|
|
|
// I18N: built on <build date> with <compiler>
|
|
- Common::U32String date = Common::U32String::format(_("(built on %s with %s)"), gScummVMBuildDate, gScummVMCompiler);
|
|
+ Common::U32String date = Common::U32String::format(_("(built with %s)"), gScummVMCompiler);
|
|
addLine(Common::U32String("C2") + date);
|
|
|
|
for (i = 0; i < ARRAYSIZE(copyright_text); i++)
|