2.0.2 release.

[virtualjaguar] / src / gui / app.cpp

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index b313f66c6eba21bc35b76fd25b5af6151668a565..d6875160132d9b9219fff8201f5550e15a2b0010 100644 (file)
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -19,6 +19,7 @@
 #include <QApplication>
 #include "log.h"
 #include "mainwin.h"
+#include "settings.h"
 #include "types.h"
 
 #ifdef __GCCWIN32__
@@ -29,15 +30,32 @@
 // Here's the main application loop--short and simple...
 int main(int argc, char * argv[])
 {
+       // Normally, this would be read in from the settings module... :-P
+       vjs.hardwareTypeAlpine = false;
+
        if (argc > 1)
        {
-               if (strcmp(argv[1], "--help") == 0)
+               if ((strcmp(argv[1], "--help") == 0) || (strcmp(argv[1], "-h") == 0)
+                       || (strcmp(argv[1], "-?") == 0))
                {
                        printf("Virtual Jaguar 2.0.0 help\n");
                        printf("\n");
-                       printf("This is an experimental branch of Virtual Jaguar, how did you get it?\n");
+                       printf("Command line interface is mostly non-functional ATM, but may return if\n"
+                               "there is enough demand for it. :-)\n");
+                       return 0;
+               }
+               if (strcmp(argv[1], "--yarrr") == 0)
+               {
+                       printf("\n");
+                       printf("Shiver me timbers!\n");
+                       printf("\n");
                        return 0;
                }
+               if ((strcmp(argv[1], "--alpine") == 0) || (strcmp(argv[1], "-a") == 0))
+               {
+                       printf("Alpine Mode enabled.\n");
+                       vjs.hardwareTypeAlpine = true;
+               }
        }
 
        Q_INIT_RESOURCE(virtualjaguar); // This must the same name as the exe filename
@@ -45,9 +63,12 @@ int main(int argc, char * argv[])
        // This is so we can pass this stuff using signal/slot mechanism...
 //ick  int id = qRegisterMetaType<uint32>();
 
-       LogInit("virtualjaguar.log");                           // Init logfile
+       bool success = (bool)LogInit("virtualjaguar.log");      // Init logfile
        int retVal = -1;                                                        // Default is failure
 
+       if (!success)
+               printf("Failed to open virtualjaguar.log for writing!\n");
+
        // Set up SDL library
        if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0)
        {
@@ -58,6 +79,10 @@ int main(int argc, char * argv[])
                WriteLog("VJ: SDL (joystick, audio) successfully initialized.\n");
                App app(argc, argv);                                    // Declare an instance of the application
                retVal = app.exec();                                    // And run it!
+
+               // Free SDL components last...!
+               SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO);
+               SDL_Quit();
        }
 
        LogDone();                                                                      // Close logfile