Minor cleanup of CVS import: renaming tagged release

[virtualjaguar] / Makefile.win32

diff --git a/Makefile.win32 b/Makefile.win32
index 070b51c0ae8291fd4674cd1c1f0e275622c28c65..c2b045b766700de1fd6e1950514fc2a878319ba5 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -1,20 +1,40 @@
-CC = gcc
-LD = gcc 
-NASM = nasm
+#
+# Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
+#
+
+# Uncomment the following lines to compile for Win32
+
+SYSTYPE   = __GCCWIN32__
+EXESUFFIX = .exe
+GLLIB     = opengl32
+ICON      = vj-ico.o
+
+# Uncomment the following lines to compile for *nix
 
-CFLAGS  = -Wall -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
+#SYSTYPE   = __GCCUNIX__
+#EXESUFFIX =
+#GLLIB     = GL
+#ICON      =
+
+CC         = gcc
+LD         = gcc
+TARGET     = vj
+
+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)
 
-TARGET = vj
+LIBS = -L/usr/local/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB)
+
+INCS = -I. -Isrc -Isrc/include -I/usr/local/include
+
+THECC = $(CC) $(CFLAGS) $(INCS)
 
 OBJS = \
        obj/anajoy.o \
        obj/blitter.o \
-       obj/blitter2.o \
        obj/cdbios.o \
        obj/cdi.o \
        obj/cdrom.o \
@@ -34,41 +54,39 @@ OBJS = \
        obj/m68kdasm.o \
        obj/memory.o \
        obj/objectp.o \
+       obj/sdlemu_config.o \
+       obj/sdlemu_opengl.o \
+       obj/settings.o \
        obj/tom.o \
        obj/unzip.o \
        obj/version.o \
-       obj/vj.o
-#      obj/m68kdasmAG.o \
-#      obj/gpu2.o \
-#      obj/dsound_dummy.o \
-
-LIBS = `sdl-config --libs` -lstdc++ -lz
-
-INCS = -I. -Isrc -Isrc/include `sdl-config --cflags`
-
-THECC = $(CC) $(CFLAGS) $(INCS)
+       obj/video.o \
+       obj/vj.o \
+       $(ICON)
 
 all: obj $(TARGET)
 
 clean:
        rm -rf obj
-       rm -f vj.exe
+       rm -f ./vj$(EXESUFFIX)
 
 obj:
        mkdir obj
 
-obj/%.o: src/%.asm
-       $(NASM) -f win32 -o $@ $<
-
 obj/%.o: src/%.c
        $(THECC) -c $< -o $@
 
 obj/%.o: src/%.cpp
        $(THECC) -c $< -o $@
 
-vj: $(OBJS) 
+vj: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-#      upx -9 vj.exe
+#      upx -9 vj$(EXESUFFIX)
+
+# 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
@@ -77,23 +95,23 @@ vj: $(OBJS)
 obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
 
-obj/m68kops.o: obj/m68kmake.exe obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
+obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o
 
-obj/m68kopac.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
+obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
 
-obj/m68kopdm.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
+obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
 
-obj/m68kopnz.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
+obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
 
 obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o
 
-obj/m68kops.h: obj/m68kmake.exe
+obj/m68kops.h: obj/m68kmake$(EXESUFFIX)
        obj/m68kmake obj src/m68k_in.c
 
-obj/m68kmake.exe: src/m68kmake.c src/m68k_in.c
-       $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake.exe
+obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
+       $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)