New unified makefile no longer needs separate compile script ;-)

diff --git a/Makefile b/Makefile
index 62b30f689652ba0d6bd92cc3c1bcc8fc30c8fcee..d1bd6f0243509372c017066b8e177340fa10b01e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,51 @@
 #
 # Unified Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
 #
-# Note that SYSTYPE, EXESUFFIX, GLLIB, ICON, and SDLLIBTYPE are passed in by the
-# script called "compile". The unified makefile should make life a little
-# easier for the maintainers. :-)
-#
-# To the Gentoo ebuild maintainers: If something is silly in the compile script
-# and/or makefile, why don't you enlighten us poor schmucks as to what's wrong? ;-)
+# by James L. Hammons
+# This software is licensed under the GPL v2. Set the file GPL.TXT for details. ;-)
 #
 
+# Figure out which system we're compiling for, and set the appropriate variables
+
+ifeq "$(OSTYPE)" "msys"                                                        # Win32
+
+SYSTYPE    = __GCCWIN32__
+EXESUFFIX  = .exe
+GLLIB      = -lopengl32
+ICON       = obj/icon.o
+SDLLIBTYPE = --libs
+MSG        = Win32 on MinGW
+
+else
+#ifeq "$(OSTYPE)" "darwin"
+ifeq "darwin" "$(findstring darwin,$(OSTYPE))" # Should catch both 'darwin' and 'darwin7.0'
+
+SYSTYPE    = __GCCUNIX__ -D_OSX_
+EXESUFFIX  =
+GLLIB      =
+ICON       =
+SDLLIBTYPE = --static-libs
+MSG        = Mac OS X
+
+else                                                                                   # *nix
+
+SYSTYPE    = __GCCUNIX__
+EXESUFFIX  =
+GLLIB      = -lGL
+ICON       =
+SDLLIBTYPE = --libs
+MSG        = generic Unix/Linux
+
+endif
+endif
+
 CC         = gcc
 LD         = gcc
-TARGET     = vj$(EXESUFFIX)
+TARGET     = vj
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-CFLAGS   = -Wall -Wno-switch -O2 -ffast-math -fomit-frame-pointer
-CPPFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
+CFLAGS   = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags`
+CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
                -ffast-math -fomit-frame-pointer `sdl-config --cflags`
 #              -fomit-frame-pointer `sdl-config --cflags` -g
 #              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
@@ -59,73 +89,113 @@ OBJS = \
        obj/video.o         \
        obj/vj.o            \
        $(ICON)
-
-all: obj $(TARGET)
+#      obj/anajoy.o 
+#      obj/cdbios.o 
+#      obj/cdi.o 
+
+all: checkenv message obj $(TARGET)$(EXESUFFIX)
+       @echo
+       @echo "*** Looks like it compiled OK... Give it a whirl!"
+
+# Check the compilation environment, barf if not appropriate
+
+checkenv:
+       @echo
+       @echo -n "*** Checking compilation environment... "
+ifeq "" "$(shell which sdl-config)"
+       @echo
+       @echo
+       @echo "It seems that you don't have the SDL development libraries installed. If you"
+       @echo "have installed them, make sure that the sdl-config file is somewhere in your"
+       @echo "path and is executable."
+       @echo
+#Is there a better way to break out of the makefile?
+       @break
+else
+       @echo "OK"
+endif
+
+message:
+       @echo
+       @echo "*** Building Virtual Jaguar for $(MSG)..."
+       @echo
 
 clean:
-       rm -rf ./obj
-       rm -f ./vj$(EXESUFFIX)
+       @echo -n "*** Cleaning out the garbage..."
+       @rm -rf obj
+       @rm -f ./$(TARGET)$(EXESUFFIX)
+       @echo done!
 
 obj:
-       mkdir ./obj
+       @mkdir obj
 
-obj/%.o: src/%.c src/%.h
-       $(CC) $(CFLAGS) `sdl-config --cflags` $(INCS) -c $< -o $@
+# This is only done for Win32 at the moment...
 
-obj/%.o: src/%.cpp src/%.h
-       $(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+ifneq "" "$(ICON)"
+$(ICON): res/$(TARGET).rc res/$(TARGET).ico
+       @echo \*\*\* Processing icon...
+       @windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
+endif
 
-#obj/%.o: src/%.c
-#      $(CC) $(CFLAGS) `sdl-config --cflags` $(INCS) -c $< -o $@
+obj/%.o: src/%.c
+       @echo "*** Compiling $<..."
+       @$(CC) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.cpp
-       $(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+       @echo "*** Compiling $<..."
+       @$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
-$(TARGET): $(OBJS)
-       $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+$(TARGET)$(EXESUFFIX): $(OBJS)
+       @echo "*** Linking it all together..."
+       @$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #      strip --strip-all vj$(EXESUFFIX)
 #      upx -9 vj$(EXESUFFIX)
 
-# Dependencies
-
-obj/dac.o:       src/settings.h
-obj/eeprom.o:    src/settings.h
-obj/gui.o:       src/settings.h
-obj/jaguar.o:    src/settings.h
-obj/joystick.o:  src/settings.h
-obj/tom.o:       src/settings.h
-obj/video.o:     src/settings.h
-obj/vj.o:        src/settings.h
-
-# Other stuff that has unusual dependencies
+# Pull in dependencies autogenerated by gcc's -MMD switch
+# The "-" in front is there just in case they haven't been created yet
 
-obj/gui.o: src/gui.cpp src/gui.h src/font1.h src/font14pt.h src/guielements.h
-obj/cdintf.o: src/cdintf.cpp src/cdintf_win32.cpp src/cdintf_osx.cpp src/cdintf_linux.cpp src/cdintf.h
+-include obj/*.d
 
 #
 # Musashi specific stuffola
 #
 
+#obj/m68k%.o: obj/m68k%.c obj/m68kops.h
+#      $(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.o
+
+#obj/m68k%.o: obj/m68k%.c obj/m68kmake$(EXESUFFIX)
+#      $(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.o
+
+#see if you can collapse all this crap into one or two lines...
+#NOTE: The above doesn't work for some reason...
+
 obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
-       $(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
+       @echo "*** Compiling m68kcpu.c..."
+       @$(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
 
 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
+       @echo "*** Compiling m68kops.c..."
+       @$(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o
 
 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
+       @echo "*** Compiling m68kopac.c..."
+       @$(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
 
 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
+       @echo "*** Compiling m68kopdm.c..."
+       @$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
 
 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
+       @echo "*** Compiling m68kopnz.c..."
+       @$(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
+       @echo "*** Compiling m68kdasm.c..."
+       @$(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 obj src/m68k_in.c
 
 obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
-       $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)
+       @echo "*** Preparing to make the Musashi core..."
+       @$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)