X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=0619b0523d070f2de61b07053a0ca800aaffa9cf;hb=4beff2f35f649bb0befa58c8a89fdd702b3c9b4f;hp=3f82f8368185ccb7d260235afe2a64d49e0bdd0c;hpb=f3e5bb2807319c210d124d6150e019130c54867b;p=virtualjaguar

diff --git a/src/vj.cpp b/src/vj.cpp
index 3f82f83..0619b05 100644
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -6,27 +6,31 @@
 // Cleanups/fixes/enhancements by James L. Hammons and Adam Green
 //
 
-#include <time.h>
 #include <SDL.h>
+#include <time.h>
+#include "file.h"
+//#include "gui.h"
 #include "jaguar.h"
-#include "video.h"
-#include "gui.h"
-#include "sdlemu_opengl.h"
-#include "settings.h"								// Pull in "vjs" struct
 #include "log.h"
-#include "version.h"
 #include "memory.h"
-#include "file.h"
+#include "sdlemu_opengl.h"
+#include "settings.h"								// Pull in "vjs" struct
+#include "video.h"
 
 // Uncomment this to use built-in BIOS/CD-ROM BIOS
 // You'll need a copy of jagboot.h & jagcd.h for this to work...!
 //#define USE_BUILT_IN_BIOS
 
+// Uncomment this for an official Virtual Jaguar release
+//#define VJ_RELEASE_VERSION "1.1.0"
+#warning !!! FIX !!! Figure out how to use this in GUI.CPP as well!
+
 #ifdef USE_BUILT_IN_BIOS
 #include "jagboot.h"
 #include "jagcd.h"
 #endif
 
+
 // Private function prototypes
 
 //
@@ -35,12 +39,16 @@
 //Maybe we should move the video stuff to TOM? Makes more sense to put it there...
 //Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!! [DONE]
 //uint32 totalFrames;//temp, so we can grab this from elsewhere...
-int main(int argc, char * argv[])
+int main_old(int argc, char * argv[])
 {
 //NOTE: This isn't actually used anywhere... !!! FIX !!!
 	int32 nFrameskip = 0;							// Default: Show every frame
 
-	printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v1.1.0\n");
+#ifdef VJ_RELEASE_VERSION
+	printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v%s\n", VJ_RELEASE_VERSION);
+#else
+	printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator SVN %s\n", __DATE__);
+#endif
 	printf("Based upon Virtual Jaguar core v1.0.0 by David Raingeard.\n");
 	printf("Written by Niels Wagenaar (Linux/WIN32), Carwin Jones (BeOS),\n");
 	printf("James L. Hammons (WIN32) and Adam Green (MacOS)\n");
@@ -48,7 +56,7 @@ int main(int argc, char * argv[])
 
 	bool haveCart = false;							// Assume there is no cartridge...!
 
-	log_init("vj.log");
+	LogInit("vj.log");
 	LoadVJSettings();								// Get config file settings...
 
 	// Check the switches... ;-)
@@ -149,55 +157,58 @@ int main(int argc, char * argv[])
 
 	WriteLog("VJ: SDL successfully initialized.\n");
 
-WriteLog("Initializing memory subsystem...\n");
-	InitMemory();
-WriteLog("Initializing version...\n");
-	InitVersion();
-	version_display(log_get());
-WriteLog("Initializing jaguar subsystem...\n");
-	jaguar_init();
+//	WriteLog("Initializing memory subsystem...\n");
+//	MemoryInit();
+#ifdef VJ_RELEASE_VERSION
+	WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
+#else
+	WriteLog("Virtual Jaguar SVN %s (Last full build was on %s %s)\n", __DATE__, __DATE__, __TIME__);
+#endif
+	WriteLog("Initializing jaguar subsystem...\n");
+	JaguarInit();
 
 	// Get the BIOS ROM
 #ifdef USE_BUILT_IN_BIOS
 	WriteLog("VJ: Using built in BIOS/CD BIOS...\n");
-	memcpy(jaguar_bootRom, jagBootROM, 0x20000);
-	memcpy(jaguar_CDBootROM, jagCDROM, 0x40000);
+	memcpy(jaguarBootROM, jagBootROM, 0x20000);
+	memcpy(jaguarCDBootROM, jagCDROM, 0x40000);
 	BIOSLoaded = CDBIOSLoaded = true;
 #else
 // What would be nice here would be a way to check if the BIOS was loaded so that we
 // could disable the pushbutton on the Misc Options menu... !!! FIX !!! [DONE here, but needs to be fixed in GUI as well!]
 WriteLog("About to attempt to load BIOSes...\n");
-	BIOSLoaded = (JaguarLoadROM(jaguar_bootRom, vjs.jagBootPath) == 0x20000 ? true : false);
+	BIOSLoaded = (JaguarLoadROM(jaguarBootROM, vjs.jagBootPath) == 0x20000 ? true : false);
 	WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not "));
-	CDBIOSLoaded = (JaguarLoadROM(jaguar_CDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
+	CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
 	WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not "));
 #endif
 
-	SET32(jaguar_mainRam, 0, 0x00200000);			// Set top of stack...
+	SET32(jaguarMainRAM, 0, 0x00200000);			// Set top of stack...
 
 WriteLog("Initializing video subsystem...\n");
-	InitVideo();
+	VideoInit();
 WriteLog("Initializing GUI subsystem...\n");
-	InitGUI();
+#warning "!!! FIX !!! (GUIInit())"
+//	GUIInit();
 
 	// Now with crunchy GUI goodness!
 WriteLog("About to start GUI...\n");
-	GUIMain(haveCart ? argv[1] : NULL);
+#warning "!!! FIX !!! (GUIMain(...))"
+//	GUIMain(haveCart ? argv[1] : NULL);
 
 //This is no longer accurate...!
 //	int elapsedTime = clock() - startTime;
 //	int fps = (1000 * totalFrames) / elapsedTime;
 //	WriteLog("VJ: Ran at an average of %i FPS.\n", fps);
 
-	jaguar_done();
-	VersionDone();
-	MemoryDone();
+	JaguarDone();
 	VideoDone();
-	log_done();
+//	MemoryDone();
+	LogDone();
 
 	// Free SDL components last...!
 	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
 	SDL_Quit();
 
-    return 0;
+	return 0;
 }