Include AppleWin version & '32/64-bit build' info-string in Benchmark dialog summary (#1392)

source/Core.cpp

@@ -295,6 +295,11 @@ UINT GetCompilationTarget(void)
 #endif
 }
 
+std::string GetAppleWinVersionAndBuild(void)
+{
+	return StrFormat("AppleWin version: %s (%d-bit build)", g_VERSIONSTRING.c_str(), GetCompilationTarget());
+}
+
 bool SetCurrentImageDir(const std::string& pszImageDir)
 {
 	g_sCurrentDir = pszImageDir;

source/Core.h

@@ -14,6 +14,7 @@ extern std::string g_VERSIONSTRING;	// Constructed in WinMain()
 
 void SetAppleWinVersion(UINT16 major, UINT16 minor, UINT16 fix, UINT16 fix_minor);
 bool CheckOldAppleWinVersion(void);
+std::string GetAppleWinVersionAndBuild(void);
 UINT GetCompilationTarget(void);
 
 extern std::string g_pAppTitle;

source/Debugger/Debugger_Help.cpp

@@ -1459,11 +1459,12 @@ Update_t CmdVersion (int nArgs)
 	int nFixMinor;
 	UnpackVersion( nVersion, nMajor, nMinor, nFixMajor, nFixMinor );
 
-	ConsolePrintFormat( "  Emulator:  %s%s%s (%d-bit build)    Debugger: %s%d.%d.%d.%d%s"
+	ConsolePrintFormat("  Emulator:  %s%s%s (%d-bit build)    Debugger: %s%d.%d.%d.%d%s"
 		, CHC_SYMBOL
 		, g_VERSIONSTRING.c_str()
 		, CHC_DEFAULT
 		, GetCompilationTarget()
+		//
 		, CHC_SYMBOL
 		, nMajor, nMinor, nFixMajor, nFixMinor
 		, CHC_DEFAULT

source/Windows/AppleWin.cpp

@@ -619,7 +619,7 @@ static void GetAppleWinVersion(void)
 		delete [] pVerInfoBlock;
     }
 
-	LogFileOutput("AppleWin version: %s (%d-bit build)\n", g_VERSIONSTRING.c_str(), GetCompilationTarget());
+	LogFileOutput("%s\n", GetAppleWinVersionAndBuild().c_str());
 }
 
 // DO ONE-TIME INITIALIZATION

source/Windows/Win32Frame.cpp

@@ -319,11 +319,14 @@ void Win32Frame::Benchmark(void)
 	// DISPLAY THE RESULTS
 	DisplayLogo();
 	std::string strText = StrFormat(
+		"%s\n"	/* AppleWin version & build */
+		"\n"
 		"Pure Video FPS:\t%u hires, %u text\n"
 		"Pure CPU MHz:\t%u.%u%s (video update)\n"
 		"Pure CPU MHz:\t%u.%u%s (full-speed)\n\n"
 		"EXPECTED AVERAGE VIDEO GAME\n"
 		"PERFORMANCE: %u FPS",
+		GetAppleWinVersionAndBuild().c_str(),
 		(unsigned)totalhiresfps,
 		(unsigned)totaltextfps,
 		(unsigned)(totalmhz10[0] / 10), (unsigned)(totalmhz10[0] % 10), (LPCTSTR)(IS_APPLE2 ? " (6502)" : ""),