Added proper versioning to build system, to avoid release confusion. :-)

[virtualjaguar] / src / jaguar.cpp

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index e75ac0ad32aaf0ff02685b8561fad963d6a82fca..f893964f6e730ebe98ce772337ae5e7132613b5f 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -5,7 +5,7 @@
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Carwin Jones (BeOS)
 // Cleanups and endian wrongness amelioration by James L. Hammons
 // Note: Endian wrongness probably stems from the MAME origins of this emu and
-//       the braindead way in which MAME handles memory. :-)
+//       the braindead way in which MAME handled memory when this was written. :-)
 //
 // JLH = James L. Hammons
 //
@@ -25,7 +25,6 @@
 #include "eeprom.h"
 #include "event.h"
 #include "gpu.h"
-//#include "gui.h"
 #include "jerry.h"
 #include "joystick.h"
 #include "log.h"
@@ -34,7 +33,6 @@
 #include "mmu.h"
 #include "settings.h"
 #include "tom.h"
-#include "video.h"
 
 #define CPU_DEBUG
 //Do this in makefile??? Yes! Could, but it's easier to define here...
@@ -67,6 +65,8 @@ uint32 jaguarMainROMCRC32, jaguarROMSize, jaguarRunAddress;
 bool BIOSLoaded = false;
 bool CDBIOSLoaded = false;
 
+uint32 * backbuffer;
+
 #ifdef CPU_DEBUG_MEMORY
 uint8 writeMemMax[0x400000], writeMemMin[0x400000];
 uint8 readMem[0x400000];
@@ -791,7 +791,7 @@ int irq_ack_handler(int level)
        return vector;
 }
 
-#define USE_NEW_MMU
+//#define USE_NEW_MMU
 
 unsigned int m68k_read_memory_8(unsigned int address)
 {
@@ -1051,8 +1051,8 @@ if (address == 0xF02110)
                WriteLog("\tA0=%08X, A1=%08X, D0=%08X, D1=%08X\n",
                        m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1),
                        m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1));
-       }
 #endif
+       }
 #else
        MMUWrite16(address, value, M68K);
 #endif
@@ -1891,7 +1891,8 @@ void ScanlineCallback(void)
 //     if (vc == vbb)
        {
                JoystickExec();
-               RenderBackbuffer();
+//We comment this out so that the GUI can manage this instead. Which is how it should be anyway.
+//             RenderBackbuffer();
                TOMResetBackbuffer(backbuffer);
                frameDone = true;
        }//*/
@@ -1908,7 +1909,7 @@ void ScanlineCallback(void)
 // This isn't currently used, but maybe it should be...
 void RenderCallback(void)
 {
-       RenderBackbuffer();
+//     RenderBackbuffer();
        TOMResetBackbuffer(backbuffer);
 //     SetCallbackTime(RenderCallback, 33303.082);     // # Scanlines * scanline time
        SetCallbackTime(RenderCallback, 16651.541);     // # Scanlines * scanline time