From d081b1c204e6dc53ef8e073bcf96f4ed811ecb58 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 13 Feb 2006 23:14:11 +0000 Subject: [PATCH] add GetArchName --- stepmania/src/arch/ArchHooks/ArchHooks.h | 5 +++++ stepmania/src/arch/ArchHooks/ArchHooks_Unix.h | 1 + stepmania/src/arch/ArchHooks/ArchHooks_Win32.h | 1 + stepmania/src/arch/ArchHooks/ArchHooks_Xbox.h | 3 +++ stepmania/src/arch/ArchHooks/ArchHooks_darwin.h | 1 + 5 files changed, 11 insertions(+) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h index 2b121653dd..d685520997 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks.h @@ -6,6 +6,11 @@ class ArchHooks public: virtual ~ArchHooks() { } + /* + * Return the general name of the architecture, eg. "Windows", "OSX", "Unix". + */ + virtual RString GetArchName() { return "generic"; } + /* This is called as soon as the loading window is shown, and we can * safely log. */ virtual void DumpDebugInfo() { } diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h index d942e184f9..d218038c8c 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h @@ -6,6 +6,7 @@ class ArchHooks_Unix: public ArchHooks { public: ArchHooks_Unix(); + RString GetArchName() { return "Unix"; } void DumpDebugInfo(); void SetTime( tm newtime ); diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h index 76c71ba7d6..539e822614 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h @@ -9,6 +9,7 @@ class ArchHooks_Win32: public ArchHooks public: ArchHooks_Win32(); ~ArchHooks_Win32(); + RString GetArchName() { return "Windows"; } void DumpDebugInfo(); void RestartProgram(); bool CheckForMultipleInstances(); diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.h b/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.h index 22ecdf6dbc..724f001f50 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.h @@ -9,10 +9,13 @@ class ArchHooks_Xbox: public ArchHooks public: ArchHooks_Xbox(); ~ArchHooks_Xbox(); + RString GetArchName() { return "Xbox"; } //void MountInitialFilesystems( const RString &sDirOfExecutable ); }; +// XXX: This stuff doesn't belong here. Hide it in ArchHooks. + // Read a 64 bit MSR register inline void READMSRREG( UINT32 reg, LARGE_INTEGER *val ) { diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h index 4848b8472e..5d42e65ae5 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h @@ -9,6 +9,7 @@ class ArchHooks_darwin : public ArchHooks public: ArchHooks_darwin(); ~ArchHooks_darwin(); + RString GetArchName() { return "OSX"; } void DumpDebugInfo(); RString GetPreferredLanguage(); void EnterTimeCriticalSection();