X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=d1cb758d830425b3fb0d6da19f6aacae331d0448;hb=22e4f2eeba52ba2a1f2808e82147dc57a9e4e44f;hp=7d8d132b65b81776ddb80d7904fc77f05b1cec59;hpb=a13130d28f50959bac485d12aa464b5040577ce1;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 7d8d132..d1cb758 100644
--- a/Makefile
+++ b/Makefile
@@ -1,117 +1,66 @@
+# Makefile for Virtual Jaguar
 #
-# Unified Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
+# by James Hammons
+# (C) 2011 Underground Software
 #
-# 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. :-)
+# Note that we control the version information here--uncomment only one set of
+# echo's from the "prepare" recipe. :-)
 #
 
-CC         = gcc
-LD         = gcc
-TARGET     = vj$(EXESUFFIX)
+FIND = find
 
-# Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-CFLAGS = -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
+# Gah
+OSTYPE := $(shell uname -a)
 
-LDFLAGS =
+# Should catch both 'darwin' and 'darwin7.0'
+ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
+QMAKE_EXTRA := -spec macx-g++
+endif
 
-LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 
-INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
+all: prepare virtualjaguar
+	@echo -e "\033[01;33m***\033[00;32m Success!\033[00m"
 
-THECC = $(CC) $(CFLAGS) $(INCS)
+prepare:
+	@echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m"
+#	@echo "#define VJ_RELEASE_VERSION \"v2.0.2\"" > src/version.h
+#	@echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h
+	@echo "#define VJ_RELEASE_VERSION \"SVN `svn info | grep -i revision`\"" > src/version.h
+	@echo "#define VJ_RELEASE_SUBVERSION \"2.0.2 Prerelease\"" >> src/version.h
 
-OBJS = \
-	obj/anajoy.o \
-	obj/blitter.o \
-	obj/cdrom.o \
-	obj/cdintf.o \
-	obj/clock.o \
-	obj/crc32.o \
-	obj/dac.o \
-	obj/dsp.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/sdlemu_config.o \
-	obj/sdlemu_opengl.o \
-	obj/settings.o \
-	obj/tom.o \
-	obj/unzip.o \
-	obj/version.o \
-	obj/video.o \
-	obj/vj.o \
-	$(ICON)
-#	obj/cdbios.o 
-#	obj/cdi.o 
+virtualjaguar: sources libs makefile-qt
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m"
+	$(MAKE) -f makefile-qt
 
-all: obj $(TARGET)
+makefile-qt: virtualjaguar.pro
+	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
+	qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
 
-clean:
-	rm -rf obj
-	rm -f ./vj$(EXESUFFIX)
-
-obj:
-	mkdir obj
-
-obj/%.o: src/%.c src/include/%.h
-	$(THECC) -c $< -o $@
-
-obj/%.o: src/%.cpp src/include/%.h
-	$(THECC) -c $< -o $@
-
-obj/%.o: src/%.c
-	$(THECC) -c $< -o $@
+libs: obj/libmusashi.a obj/libjaguarcore.a
+	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
 
-obj/%.o: src/%.cpp
-	$(THECC) -c $< -o $@
+obj/libmusashi.a: musashi.mak sources
+	@echo -e "\033[01;33m***\033[00;32m Making Musashi...\033[00m"
+	$(MAKE) -f musashi.mak
 
-$(TARGET): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-#	strip --strip-all vj$(EXESUFFIX)
-#	upx -9 vj$(EXESUFFIX)
+obj/libjaguarcore.a: jaguarcore.mak sources
+	@echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar core...\033[00m"
+	$(MAKE) -f jaguarcore.mak
 
-# Other stuff that has unusual dependencies
-
-obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h
-obj/cdintf.o: src/cdintf.cpp src/cdintf_win32.cpp src/cdintf_osx.cpp src/cdintf_linux.cpp src/include/cdintf.h
-
-#
-# Musashi specific stuffola
-#
+sources: src/*.h src/*.cpp src/*.c
 
-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$(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$(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$(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$(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$(EXESUFFIX)
-	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)
+clean:
+	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
+	@-rm -rf ./obj
+	@-rm -rf makefile-qt
+	@-rm -rf virtualjaguar
+	@-$(FIND) . -name "*~" -exec rm -f {} \;
+	@echo "done!"
+
+statistics:
+	@echo -n "Lines in source files: "
+	@-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
+	@echo -n "Lines in header files: "
+	@-$(FIND) ./src -name "*.h" | xargs cat | wc -l
+
+dist:	clean