[Scummvm-git-logs] scummvm master -> f6641e18b2b7cab566da8c170ac7f3759f61e4f2
sev-
noreply at scummvm.org
Fri Apr 15 20:44:01 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b51e8a8f58 BASE: Include compiler name/version info
1e33079b25 GUI: Print compiler name/version in About dialog
f6641e18b2 BUILD: Remove support for ancient SGI MIPSpro
Commit: b51e8a8f58bb7ddd35d8c05f8034a41d58034d8c
https://github.com/scummvm/scummvm/commit/b51e8a8f58bb7ddd35d8c05f8034a41d58034d8c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-04-15T22:43:57+02:00
Commit Message:
BASE: Include compiler name/version info
Changed paths:
base/version.cpp
base/version.h
diff --git a/base/version.cpp b/base/version.cpp
index 1d54b4cfe05..70ca120ab9d 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -60,6 +60,23 @@ static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMM
#endif
const char gScummVMBuildDate[] = __DATE__ " " __TIME__;
const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
+const char gScummVMCompiler[] = ""
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#if defined(_MSC_VER)
+ "MSVC " STR(_MSC_FULL_VER)
+#elif defined(__INTEL_COMPILER)
+ "ICC " STR(__INTEL_COMPILER) "." STR(__INTEL_COMPILER_UPDATE)
+#elif defined(__clang__)
+ "Clang " STR(__clang_major__) "." STR(__clang_minor__) "." STR(__clang_patchlevel__)
+#elif defined(__GNUC__)
+ "GCC " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__)
+#else
+ "unknown compiler"
+#endif
+#undef STR
+#undef STR_HELPER
+ ;
const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
const char gScummVMFeatures[] = ""
#ifdef TAINTED_BUILD
diff --git a/base/version.h b/base/version.h
index 74fb22acd8e..657a703f41d 100644
--- a/base/version.h
+++ b/base/version.h
@@ -25,6 +25,7 @@
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)"
extern const char gScummVMFeatures[]; // e.g. "ALSA MPEG2 zLib"
Commit: 1e33079b25d8676df57edc93979bcdcba71c7188
https://github.com/scummvm/scummvm/commit/1e33079b25d8676df57edc93979bcdcba71c7188
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-04-15T22:43:57+02:00
Commit Message:
GUI: Print compiler name/version in About dialog
Changed paths:
gui/about.cpp
diff --git a/gui/about.cpp b/gui/about.cpp
index 6177b28851b..56d76c5ee57 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -100,7 +100,7 @@ AboutDialog::AboutDialog()
version += gScummVMVersion;
_lines.push_back(version);
- Common::U32String date = Common::U32String::format(_("(built on %s)"), gScummVMBuildDate);
+ Common::U32String date = Common::U32String::format(_("(built on %s with %s)"), gScummVMBuildDate, gScummVMCompiler);
_lines.push_back(Common::U32String("C2") + date);
for (i = 0; i < ARRAYSIZE(copyright_text); i++)
Commit: f6641e18b2b7cab566da8c170ac7f3759f61e4f2
https://github.com/scummvm/scummvm/commit/f6641e18b2b7cab566da8c170ac7f3759f61e4f2
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-04-15T22:43:57+02:00
Commit Message:
BUILD: Remove support for ancient SGI MIPSpro
This very old compiler has no C++11 support, so we're now sure that
its support (and workarounds) can be removed.
Changed paths:
common/hashmap.h
configure
devtools/create_titanic/hashmap.h
devtools/create_xeen/hashmap.h
graphics/scaler/scale2x.h
graphics/scaler/scale3x.h
diff --git a/common/hashmap.h b/common/hashmap.h
index 01e6d648850..70e7550b8ee 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -62,10 +62,8 @@ namespace Common {
* @{
*/
-// The sgi IRIX MIPSpro Compiler has difficulties with nested templates.
-// This and the other __sgi conditionals below work around these problems.
-// The Intel C++ Compiler suffers from the same problems.
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+// The Intel C++ Compiler has difficulties with nested templates.
+#if defined(__INTEL_COMPILER)
template<class T> class IteratorImpl;
#endif
@@ -158,9 +156,7 @@ private:
size_type lookupAndCreateIfMissing(const Key &key);
void expandStorage(size_type newCapacity);
-#if !defined(__sgi) || defined(__GNUC__)
template<class T> friend class IteratorImpl;
-#endif
/**
* Simple HashMap iterator implementation.
@@ -168,7 +164,7 @@ private:
template<class NodeType>
class IteratorImpl {
friend class HashMap;
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
template<class T> friend class Common::IteratorImpl;
#else
template<class T> friend class IteratorImpl;
diff --git a/configure b/configure
index f7f9efc578d..803465419eb 100755
--- a/configure
+++ b/configure
@@ -2109,28 +2109,7 @@ else
echo non-gcc compiler version ${cxx_version}
fi
cxx_verc_fail=yes
-
- case $_host_os in
- irix*)
- case $cxx_version in
- 7.4.4*)
- # We just assume this is SGI MIPSpro
- cxx_version="assumed SGI MIPSpro $cxx_version, ok"
- cxx_verc_fail=no
- _cxx_major=7
- _cxx_minor=4
- add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MDupdate "$(*D)/$(DEPDIR)/$(*F).d"'
- add_line_to_config_mk '-include Makedepend'
- ;;
- *)
- cxx_version="$cxx_version, bad"
- ;;
- esac
- ;;
- *)
- cxx_version="$cxx_version, bad"
- ;;
- esac
+ cxx_version="$cxx_version, bad"
fi
echo "$cxx_version"
diff --git a/devtools/create_titanic/hashmap.h b/devtools/create_titanic/hashmap.h
index da026a0c8e3..d473cbfde31 100644
--- a/devtools/create_titanic/hashmap.h
+++ b/devtools/create_titanic/hashmap.h
@@ -56,10 +56,8 @@
namespace Common {
-// The sgi IRIX MIPSpro Compiler has difficulties with nested templates.
-// This and the other __sgi conditionals below work around these problems.
-// The Intel C++ Compiler suffers from the same problems.
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+// The Intel C++ Compiler has difficulties with nested templates.
+#if defined(__INTEL_COMPILER)
template<class T> class IteratorImpl;
#endif
@@ -152,9 +150,7 @@ private:
size_type lookupAndCreateIfMissing(const Key &key);
void expandStorage(size_type newCapacity);
-#if !defined(__sgi) || defined(__GNUC__)
template<class T> friend class IteratorImpl;
-#endif
/**
* Simple HashMap iterator implementation.
@@ -162,7 +158,7 @@ private:
template<class NodeType>
class IteratorImpl {
friend class HashMap;
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
template<class T> friend class Common::IteratorImpl;
#else
template<class T> friend class IteratorImpl;
diff --git a/devtools/create_xeen/hashmap.h b/devtools/create_xeen/hashmap.h
index da026a0c8e3..d473cbfde31 100644
--- a/devtools/create_xeen/hashmap.h
+++ b/devtools/create_xeen/hashmap.h
@@ -56,10 +56,8 @@
namespace Common {
-// The sgi IRIX MIPSpro Compiler has difficulties with nested templates.
-// This and the other __sgi conditionals below work around these problems.
-// The Intel C++ Compiler suffers from the same problems.
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+// The Intel C++ Compiler has difficulties with nested templates.
+#if defined(__INTEL_COMPILER)
template<class T> class IteratorImpl;
#endif
@@ -152,9 +150,7 @@ private:
size_type lookupAndCreateIfMissing(const Key &key);
void expandStorage(size_type newCapacity);
-#if !defined(__sgi) || defined(__GNUC__)
template<class T> friend class IteratorImpl;
-#endif
/**
* Simple HashMap iterator implementation.
@@ -162,7 +158,7 @@ private:
template<class NodeType>
class IteratorImpl {
friend class HashMap;
-#if (defined(__sgi) && !defined(__GNUC__)) || defined(__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
template<class T> friend class Common::IteratorImpl;
#else
template<class T> friend class IteratorImpl;
diff --git a/graphics/scaler/scale2x.h b/graphics/scaler/scale2x.h
index 87d91ac1cb7..7f7f41cea41 100644
--- a/graphics/scaler/scale2x.h
+++ b/graphics/scaler/scale2x.h
@@ -26,11 +26,6 @@
#define __restrict__
#endif
-#ifdef __sgi
-#define __restrict__ __restrict
-#endif
-
-
typedef unsigned char scale2x_uint8;
typedef unsigned short scale2x_uint16;
typedef unsigned scale2x_uint32;
diff --git a/graphics/scaler/scale3x.h b/graphics/scaler/scale3x.h
index 9f95f81ed4f..e94e02f7483 100644
--- a/graphics/scaler/scale3x.h
+++ b/graphics/scaler/scale3x.h
@@ -26,10 +26,6 @@
#define __restrict__
#endif
-#ifdef __sgi
-#define __restrict__ __restrict
-#endif
-
typedef unsigned char scale3x_uint8;
typedef unsigned short scale3x_uint16;
typedef unsigned scale3x_uint32;
More information about the Scummvm-git-logs
mailing list