Moved final remaining bits of SDL-specific code out of src/emucore.

src/common/MediaFactory.hxx

@@ -19,6 +19,7 @@
 #define MEDIA_FACTORY_HXX
 
 #include "bspf.hxx"
+#include "SDL_lib.hxx"
 
 #include "OSystem.hxx"
 #include "Settings.hxx"
@@ -129,6 +130,16 @@ class MediaFactory
       SDL_Quit();
     }
 
+    static string backendName()
+    {
+      ostringstream buf;
+      SDL_version ver;
+      SDL_GetVersion(&ver);
+      buf << "SDL " << int(ver.major) << "." << int(ver.minor) << "." << int(ver.patch);
+
+      return buf.str();
+    }
+
   private:
     // Following constructors and assignment operators not supported
     MediaFactory() = delete;

src/common/Version.hxx

@@ -18,7 +18,7 @@
 #ifndef VERSION_HXX
 #define VERSION_HXX
 
-#define STELLA_VERSION "6.0_beta1"
-#define STELLA_BUILD "4514"
+#define STELLA_VERSION "6.0_beta2"
+#define STELLA_BUILD "4603"
 
 #endif

src/emucore/OSystem.cxx

@@ -87,11 +87,8 @@ OSystem::OSystem()
 
   // Get build info
   ostringstream info;
-  SDL_version ver;
-  SDL_GetVersion(&ver);
 
-  info << "Build " << STELLA_BUILD << ", using SDL " << int(ver.major)
-       << "." << int(ver.minor) << "."<< int(ver.patch)
+  info << "Build " << STELLA_BUILD << ", using " << MediaFactory::backendName()
        << " [" << BSPF::ARCH << "]";
   myBuildInfo = info.str();