X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fapp.cpp;h=aad90feb2b128db4e6982916d2356868f7ea6f01;hb=6fb8c1441184b33847cfe668022aaf31b54a71e0;hp=9a2cdbfaddba548b5fef72f0fa73a35275ac319d;hpb=09adab3161f986d5cc8dbeffe15cb6545afa138f;p=virtualjaguar

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 9a2cdbf..aad90fe 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -9,36 +9,81 @@
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
+// JLH  01/21/2011  Added SDL initialization
+// JLH  06/26/2011  Added fix to keep SDL from hijacking main() on win32
 //
 
 #include "app.h"
 
+#include <SDL.h>
 #include <QApplication>
+#include "log.h"
 #include "mainwin.h"
+#include "settings.h"
 #include "types.h"
 
+#ifdef __GCCWIN32__
+// Apparently on win32, SDL is hijacking main from Qt. So let's do this:
+#undef main
+#endif
+
 // 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 non-functional ATM, but may return if there is\n"
+				"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(vj);	// This must the same name as the exe filename
+	Q_INIT_RESOURCE(virtualjaguar);	// This must the same name as the exe filename
 //or is it the .qrc filename???
 	// This is so we can pass this stuff using signal/slot mechanism...
 //ick	int id = qRegisterMetaType<uint32>();
 
-	App app(argc, argv);						// Declare an instance of the application
+	LogInit("virtualjaguar.log");				// Init logfile
+	int retVal = -1;							// Default is failure
+
+	// Set up SDL library
+	if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0)
+	{
+		WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError());
+	}
+	else
+	{
+		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();
+	}
 
-	return app.exec();							// And run it!
+	LogDone();									// Close logfile
+	return retVal;
 }
 
 // Main app constructor--we stick globally accessible stuff here...