Fixed makefiles so that they're more uniform/easier to maintain

diff --git a/Makefile.unix b/Makefile.unix
index 41fe26d474f93e23cec8413048c0ac26e3878085..717caa0b144ae31c75bc1f4db5eeed7db48769da 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -1,43 +1,47 @@
-CC = gcc
-LD = gcc 
-NASM = nasm
-
-CFLAGS  = -Wall -O3 -D__PORT__ -D__GCCUNIX__ -Dstricmp="strcasecmp" \
-                       -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
-#                      -fomit-frame-pointer `sdl-config --cflags`
+CC        = gcc
+LD        = gcc
+SYSTYPE   = __GCCUNIX__
+EXESUFFIX =
+
+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
 #                      -fomit-frame-pointer `sdl-config --cflags` -DTOM_DEBUG
 
 LDFLAGS = $(CFLAGS)
 
-TARGET = jag_em
+TARGET = vj
 
 OBJS = \
-       obj/version.o \
-       obj/pcm.o \
-       obj/objectp.o \
-       obj/memory.o \
-       obj/m68kdasmAG.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/Jagem.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/m68kcpu.o obj/m68kops.o obj/m68kopac.o obj/m68kopdm.o obj/m68kopnz.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/memory.o \
+       obj/objectp.o \
+       obj/tom.o \
+       obj/unzip.o \
+       obj/version.o \
+       obj/vj.o
+#      obj/m68kdasmAG.o \
+#      obj/gpu2.o \
 
-LIBS = `sdl-config --libs` -lstdc++
+LIBS = `sdl-config --libs` -lstdc++ -lz
 
 INCS = -I. -Isrc -Isrc/include `sdl-config --cflags`
 
@@ -47,23 +51,25 @@ all: obj $(TARGET)
 
 clean:
        rm -rf obj
-       rm -f ./jag_em
+       rm -f ./vj$(EXESUFFIX)
 
 obj:
        mkdir obj
 
-obj/%.o: src/%.asm
-       $(NASM) -f elf -o $@ $<
-
 obj/%.o: src/%.c
        $(THECC) -c $< -o $@
 
 obj/%.o: src/%.cpp
        $(THECC) -c $< -o $@
 
-jag_em: $(OBJS) 
+vj: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-       # upx -9 jag_em
+#      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
@@ -84,8 +90,11 @@ obj/m68kopdm.o: obj/m68kmake obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kcon
 obj/m68kopnz.o: obj/m68kmake obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
        $(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
 
-obj/m68kops.h: obj/m68kmake
+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$(EXESUFFIX)
        obj/m68kmake obj src/m68k_in.c
 
-obj/m68kmake: src/m68kmake.c src/m68k_in.c
-       $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake
+obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
+       $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)

diff --git a/Makefile.win32 b/Makefile.win32
index d60c5d5e2c053cd90626d7752b0acf74b37895db..29edcced996613ca5a8b9dfe4108af480bb24cad 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -1,8 +1,9 @@
-CC = gcc
-LD = gcc 
-NASM = nasm
+CC        = gcc
+LD        = gcc
+SYSTYPE   = __GCCWIN32__
+EXESUFFIX = .exe
 
-CFLAGS  = -Wall -Wno-switch -O3 -D__PORT__ -D__GCCWIN32__ -Dstricmp="strcasecmp" \
+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
 #                      -fomit-frame-pointer `sdl-config --cflags` -DTOM_DEBUG
@@ -39,8 +40,6 @@ OBJS = \
        obj/vj.o
 #      obj/m68kdasmAG.o \
 #      obj/gpu2.o \
-#      obj/dsound_dummy.o \
-#      obj/blitter2.o \
 
 LIBS = `sdl-config --libs` -lstdc++ -lz
 
@@ -52,23 +51,20 @@ 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
 
@@ -97,8 +93,8 @@ obj/m68kopnz.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68
 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)