From f3282d299cf363c58522739f8f71f297151fce3a Mon Sep 17 00:00:00 2001 From: stephena Date: Sun, 8 Nov 2009 18:42:12 +0000 Subject: [PATCH] CPU architecture info is now shown in AboutDialog, next to the build version and SDL library. Bumped version # for test builds for AtariAge members. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1897 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- src/common/Version.hxx | 2 +- src/emucore/OSystem.cxx | 2 +- src/emucore/m6502/src/bspf/src/bspf.hxx | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 278b33335..0dfdc5c14 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -21,7 +21,7 @@ #include -#define STELLA_BASE_VERSION "3.1_svn" +#define STELLA_BASE_VERSION "3.1_test1" #ifdef NIGHTLY_BUILD #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index b85d8d737..b2eaef1d2 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -117,7 +117,7 @@ OSystem::OSystem() info << "Build " << STELLA_BUILD << ", using "; info << "SDL " << (int)ver->major << "." << (int)ver->minor << "." << (int)ver->patch << " "; - info << "[" << " " << "]"; + info << "[" << BSPF_ARCH << "]"; myBuildInfo = info.str(); #if 0 diff --git a/src/emucore/m6502/src/bspf/src/bspf.hxx b/src/emucore/m6502/src/bspf/src/bspf.hxx index e3eb0a828..6e2be7732 100644 --- a/src/emucore/m6502/src/bspf/src/bspf.hxx +++ b/src/emucore/m6502/src/bspf/src/bspf.hxx @@ -102,6 +102,18 @@ #define BSPF_vsnprintf vsnprintf #endif +// CPU architecture type +// This isn't complete yet, but takes care of all the major platforms +#if defined(__i386__) + #define BSPF_ARCH "i386" +#elif defined(__x86_64__) + #define BSPF_ARCH "x86_64" +#elif defined(__powerpc__) || defined(__ppc__) + #define BSPF_ARCH "ppc" +#else + #define BSPF_ARCH "NOARCH" +#endif + // Some convenience functions template inline void BSPF_swap(T &a, T &b) { T tmp = a; a = b; b = tmp; } template inline T BSPF_abs (T x) { return (x>=0) ? x : -x; }