Move some app-specific stuff from SdlApp to main.cpp

src/projects/machines/machines_main.cpp

@@ -1,12 +1,20 @@
-#include "afx/AfxSdlApp.hpp"
+#include "sdlapp.hpp"
+
+#include "MachinesVersion.hpp"
 
 #include <SDL.h>
 
 int main(int argc, char* argv[])
 {
+ SDLApp app;
+ app.setAppName("Machines");
+ app.setAppVersion(machinesVersion());
+ app.setAppBuildVersion(machinesBuildVersion());
+ app.setLoggingEnabled(true);
+
  try
  {
- AfxSdlApp::sdlInstance().initialise(argc, argv);
+ app.initialise(argc, argv);
 
  auto const runResult = AfxApp::abstractInstance().run();
 

src/projects/machines/sdlapp.cpp

@@ -41,8 +41,6 @@
 #include "machgui/ctxoptns.hpp"
 #include "machgui/gui.hpp"
 
-#include "MachinesVersion.hpp"
-
 #include "spdlog/spdlog.h"
 #include <cstdio>
 
@@ -76,11 +74,6 @@ SDLApp::SDLApp()
 {
  for (int i = 0; i < 4; ++i)
  aShowRace_[i] = false;
-
- setAppName("Machines");
- setLoggingEnabled(true);
- setAppVersion(machinesVersion());
- setAppBuildVersion(machinesBuildVersion());
 }
 
 SDLApp::~SDLApp()

src/projects/machines/sdlapp.hpp

@@ -27,7 +27,9 @@ class MachGuiStartupScreens;
 class SDLApp : public AfxOSSpecificApp<SDLApp>
 {
 public:
+ SDLApp();
  ~SDLApp() override;
+
  enum StartedFromLobby
  {
  LOBBY_START,
@@ -36,7 +38,6 @@ class SDLApp : public AfxOSSpecificApp<SDLApp>
 
 private:
  friend class AfxSingletonApp;
- SDLApp();
 
  // Provide virtual fns required by base classes.
  void clientShutdown() override;

src/projects/planeted/planeted_main.cpp

@@ -1,12 +1,19 @@
-#include "afx/AfxSdlApp.hpp"
+#include "sdlapp.hpp"
+
+#include "MachinesVersion.hpp"
 
 #include <SDL.h>
 
 int main(int argc, char* argv[])
 {
+ SDLApp app;
+ app.setAppName("Machines Planet Editor");
+ app.setAppVersion("v0.00.01");
+ app.setAppBuildVersion(machinesBuildVersion());
+
  try
  {
- AfxSdlApp::sdlInstance().initialise(argc, argv);
+ app.initialise(argc, argv);
 
  auto const runResult = AfxApp::abstractInstance().run();
 

src/projects/planeted/sdlapp.cpp

@@ -49,8 +49,6 @@
 #include "machphys/levels.hpp"
 #include "machphys/persist.hpp"
 
-#include "MachinesVersion.hpp"
-
 class ProgressIndicator : public IProgressReporter
 {
 public:
@@ -135,10 +133,6 @@ SDLApp::SDLApp()
 {
  for (int i = 0; i < 4; ++i)
  aShowRace_[i] = false;
-
- setAppName("Machines Planet Editor");
- setAppVersion("v0.00.01");
- setAppBuildVersion(machinesBuildVersion());
 }
 
 SDLApp::~SDLApp()

src/projects/planeted/sdlapp.hpp

@@ -30,11 +30,11 @@ class EnvPlanetEnvironment;
 class SDLApp : public AfxOSSpecificApp<SDLApp>
 {
 public:
+ SDLApp();
  ~SDLApp() override;
 
 private:
  friend class AfxSingletonApp;
- SDLApp();
 
  // Provide virtual fns required by base classes.
  void clientShutdown() override;