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

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 9a2cdbf..82a4010 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -9,14 +9,22 @@
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
+// JLH  01/21/2011  Added SDL initialization
 //
 
 #include "app.h"
 
+#include <SDL.h>
 #include <QApplication>
+#include "log.h"
 #include "mainwin.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[])
 {
@@ -31,14 +39,28 @@ int main(int argc, char * argv[])
 		}
 	}
 
-	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!
+	}
 
-	return app.exec();							// And run it!
+	LogDone();									// Close logfile
+	return retVal;
 }
 
 // Main app constructor--we stick globally accessible stuff here...