Changes for 1.0.6 update

diff --git a/Makefile.unix b/Makefile.unix
index 1237bae9f11115ede6a01bca56ad4ed51d91b0af..2a774255087ea6f782c71f67d14cddac4c531c01 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -7,20 +7,22 @@
 #SYSTYPE   = __GCCWIN32__
 #EXESUFFIX = .exe
 #GLLIB     = opengl32
+#ICON      = vj-ico.o
 
 # Uncomment the following lines to compile for *nix
 
 SYSTYPE   = __GCCUNIX__
 EXESUFFIX =
 GLLIB     = GL
+ICON      =
 
 CC        = gcc
 LD        = gcc
 TARGET    = vj
 
-CFLAGS  = -Wall -Wno-switch -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
-                       -fomit-frame-pointer `sdl-config --cflags`
-#                      -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
+CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
+               -fomit-frame-pointer `sdl-config --cflags`
+#              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS = $(CFLAGS)
 
@@ -59,7 +61,8 @@ OBJS = \
        obj/unzip.o \
        obj/version.o \
        obj/video.o \
-       obj/vj.o
+       obj/vj.o \
+       $(ICON)
 
 all: obj $(TARGET)
 

diff --git a/Makefile.win32 b/Makefile.win32
index 299860c759a93401f8406d092add0d081fda2568..c2b045b766700de1fd6e1950514fc2a878319ba5 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -7,20 +7,22 @@
 SYSTYPE   = __GCCWIN32__
 EXESUFFIX = .exe
 GLLIB     = opengl32
+ICON      = vj-ico.o
 
 # Uncomment the following lines to compile for *nix
 
 #SYSTYPE   = __GCCUNIX__
 #EXESUFFIX =
 #GLLIB     = GL
+#ICON      =
 
-CC        = gcc
-LD        = gcc
-TARGET    = vj
+CC         = gcc
+LD         = gcc
+TARGET     = vj
 
-CFLAGS  = -Wall -Wno-switch -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
-                       -fomit-frame-pointer `sdl-config --cflags`
-#                      -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
+CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
+               -fomit-frame-pointer `sdl-config --cflags`
+#              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS = $(CFLAGS)
 
@@ -59,7 +61,8 @@ OBJS = \
        obj/unzip.o \
        obj/version.o \
        obj/video.o \
-       obj/vj.o
+       obj/vj.o \
+       $(ICON)
 
 all: obj $(TARGET)
 

diff --git a/src/gpu.cpp b/src/gpu.cpp
index 464350cf9fbb7453e6da89be7a1563658ffeaad0..f1d9c727cef3371589a814520710a72b3ebc46b2 100644 (file)
--- a/src/gpu.cpp
+++ b/src/gpu.cpp
@@ -435,9 +435,9 @@ uint16 GPUReadWord(uint32 offset, uint32 who/*=UNKNOWN*/)
                        return data >> 16;
        }
 
-//TEMP--Mirror of F03000?
-if (offset >= 0xF0B000 && offset <= 0xF0BFFF)
-WriteLog("[GPUR16] --> Possible GPU RAM mirror access by %s!", whoName[who]);
+//TEMP--Mirror of F03000? No. Writes only...
+//if (offset >= 0xF0B000 && offset <= 0xF0BFFF)
+//WriteLog("[GPUR16] --> Possible GPU RAM mirror access by %s!", whoName[who]);
 
        return JaguarReadWord(offset, who);
 }
@@ -493,9 +493,9 @@ uint32 GPUReadLong(uint32 offset, uint32 who/*=UNKNOWN*/)
                        return 0;
                }
        }
-//TEMP--Mirror of F03000?
-if (offset >= 0xF0B000 && offset <= 0xF0BFFF)
-       WriteLog("[GPUR32] --> Possible GPU RAM mirror access by %s!\n", whoName[who]);
+//TEMP--Mirror of F03000? No. Writes only...
+//if (offset >= 0xF0B000 && offset <= 0xF0BFFF)
+//     WriteLog("[GPUR32] --> Possible GPU RAM mirror access by %s!\n", whoName[who]);
 /*if (offset >= 0xF1D000 && offset <= 0xF1DFFF)
        WriteLog("[GPUR32] --> Reading from Wavetable ROM!\n");//*/
 

diff --git a/src/log.cpp b/src/log.cpp
index 144eb3bfa3fbe838f8512659014a134f9daa64c9..e4d410673d9bea7f8e4f3ea215980e31636c0567 100644 (file)
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -50,7 +50,7 @@ void WriteLog(const char * text, ...)
                fflush(log_stream);
                fclose(log_stream);
                exit(1);
-       }
+       }//*/
 
        va_end(arg);
        fflush(log_stream);                                     // Make sure that text is written!

diff --git a/src/vj.cpp b/src/vj.cpp
index de9a9a92999f31319facc370320ca946e31b5333..e33ffe25f00887e4273ff8d11e8155d6b95f4812 100644 (file)
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -290,7 +290,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
        char * ext = strrchr(path, '.');
        if (ext != NULL)
        {
-               WriteLog("VJ: Loading %s...", path);
+               WriteLog("VJ: Loading \"%s\"...", path);
 
                if (stricmp(ext, ".zip") == 0)
                {