Remove stopping on bad memory access ;-)

[virtualjaguar] / Makefile.win32

diff --git a/Makefile.win32 b/Makefile.win32
index e83eb3fb240a4d9be22a3fb41425e8b9ddeaeb3c..d60c5d5e2c053cd90626d7752b0acf74b37895db 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -2,7 +2,7 @@ CC = gcc
 LD = gcc 
 NASM = nasm
 
-CFLAGS  = -Wall -O3 -D__PORT__ -D__GCCWIN32__ -Dstricmp="strcasecmp" \
+CFLAGS  = -Wall -Wno-switch -O3 -D__PORT__ -D__GCCWIN32__ -Dstricmp="strcasecmp" \
                        -fomit-frame-pointer `sdl-config --cflags`
 #                      -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 #                      -fomit-frame-pointer `sdl-config --cflags` -DTOM_DEBUG
@@ -12,34 +12,35 @@ LDFLAGS = $(CFLAGS)
 TARGET = vj
 
 OBJS = \
-       obj/version.o \
-       obj/pcm.o \
-       obj/objectp.o \
-       obj/memory.o \
-       obj/log.o \
-       obj/jerry.o \
-       obj/jaguar.o \
-       obj/jagdasm.o \
-       obj/eeprom.o \
-       obj/dsound_dummy.o \
-       obj/crc32.o \
-       obj/clock.o \
-       obj/cdrom.o \
-       obj/cdi.o \
-       obj/cdbios.o \
-       obj/blitter.o \
        obj/anajoy.o \
-       obj/tom.o \
-       obj/joystick.o \
-       obj/gpu.o \
+       obj/blitter.o \
+       obj/cdbios.o \
+       obj/cdi.o \
+       obj/cdrom.o \
+       obj/clock.o \
+       obj/crc32.o \
+       obj/dac.o \
        obj/dsp.o \
-       obj/blitter2.o \
-       obj/vj.o \
-       obj/unzip.o \
+       obj/eeprom.o \
+       obj/gpu.o \
+       obj/gui.o \
+       obj/jagdasm.o \
+       obj/jaguar.o \
+       obj/jerry.o \
+       obj/joystick.o \
+       obj/log.o \
        obj/m68kcpu.o obj/m68kops.o obj/m68kopac.o obj/m68kopdm.o obj/m68kopnz.o \
-       obj/m68kdasm.o
+       obj/m68kdasm.o \
+       obj/memory.o \
+       obj/objectp.o \
+       obj/tom.o \
+       obj/unzip.o \
+       obj/version.o \
+       obj/vj.o
 #      obj/m68kdasmAG.o \
 #      obj/gpu2.o \
+#      obj/dsound_dummy.o \
+#      obj/blitter2.o \
 
 LIBS = `sdl-config --libs` -lstdc++ -lz
 
@@ -69,6 +70,11 @@ vj: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #      upx -9 vj.exe
 
+# Other stuff that has unusual dependencies
+
+obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h
+       $(THECC) -c src/gui.cpp -o obj/gui.o
+
 #
 # Musashi specific stuffola
 #