From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 19 Sep 2003 17:38:16 +0000 (+0000)
Subject: Changes for 1.0.6 update
X-Git-Tag: 1.0.6~7
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99c569a1257cc13ddd2201870266c9ef83ee3fcc;p=virtualjaguar

Changes for 1.0.6 update
---

diff --git a/Makefile.unix b/Makefile.unix
index 1237bae..2a77425 100644
--- 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 299860c..c2b045b 100644
--- 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 464350c..f1d9c72 100644
--- 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 144eb3b..e4d4106 100644
--- 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 de9a9a9..e33ffe2 100644
--- 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)
 		{