X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jaguarcore.mak;h=1bcafe0e1baec2b0737fcc46d5a3839dc852a263;hb=437c16a8f1d73b28d7262819654b88b207231154;hp=d3cc25736ff8e753d723d5bc506b3faf2a5547f7;hpb=5da604521611a960140b58a2fb0f236c65610b70;p=virtualjaguar

diff --git a/jaguarcore.mak b/jaguarcore.mak
index d3cc257..1bcafe0 100644
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -1,7 +1,7 @@
 #
 # Makefile for Virtual Jaguar core library
 #
-# by James L. Hammons
+# by James Hammons
 #
 # This software is licensed under the GPL v3 or any later version. See the
 # file GPLv3 for details. ;-)
@@ -11,22 +11,26 @@
 
 OSTYPE := $(shell uname -a)
 
-ifeq "$(findstring Msys,$(OSTYPE))" "Msys"			# Win32
+# Win32
+ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
 
 SYSTYPE    := __GCCWIN32__
 SDLLIBTYPE := --libs
 
-else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"	# Should catch both 'darwin' and 'darwin7.0'
+# Apple. Should catch both 'darwin' and 'darwin7.0'
+else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
 
-SYSTYPE    := __GCCUNIX__ -D_OSX_
+SYSTYPE    := __GCCUNIX__ -D__THINK_STUPID__
 SDLLIBTYPE := --static-libs
 
-else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"		# Linux
+# Linux
+else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
 
 SYSTYPE    := __GCCUNIX__
 SDLLIBTYPE := --libs
 
-else											# ???
+# ??? Throw error, unknown OS
+else
 
 $(error OS TYPE UNDETECTED)
 
@@ -41,14 +45,20 @@ HAVECDIO :=
 CDIOLIB  :=
 endif
 
-CC      := gcc
-LD      := gcc
-AR      := ar
-ARFLAGS := -rs
+CC       := gcc
+LD       := gcc
+AR       := ar
+ARFLAGS  := -rs
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-CFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer `sdl-config --cflags` -D$(SYSTYPE)
-CXXFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer `sdl-config --cflags` -D$(SYSTYPE)
+#CFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer `sdl-config --cflags` -D$(SYSTYPE)
+#CXXFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer `sdl-config --cflags` -D$(SYSTYPE)
+CFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+CXXFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+
+SDL_CFLAGS = `sdl-config --cflags`
+DEFINES = -D$(SYSTYPE)
+GCC_DEPS = "-MMD"
 
 INCS := -I./src
 
@@ -64,6 +74,11 @@ OBJS := \
 	obj/file.o         \
 	obj/filedb.o       \
 	obj/gpu.o          \
+	obj/jagbios.o      \
+	obj/jagcdbios.o    \
+	obj/jagdevcdbios.o \
+	obj/jagstub1bios.o \
+	obj/jagstub2bios.o \
 	obj/jagdasm.o      \
 	obj/jaguar.o       \
 	obj/jerry.o        \
@@ -71,7 +86,7 @@ OBJS := \
 	obj/log.o          \
 	obj/memory.o       \
 	obj/mmu.o          \
-	obj/objectp.o      \
+	obj/op.o           \
 	obj/settings.o     \
 	obj/state.o        \
 	obj/tom.o          \
@@ -96,10 +111,12 @@ obj/libjaguarcore.a: $(OBJS)
 
 obj/%.o: src/%.c
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
+#	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
+	@$(CC) $(GCC_DEPS) $(CFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.cpp
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-	@$(CC) $(CXXFLAGS) $(INCS) -c $< -o $@
+#	@$(CC) $(CXXFLAGS) $(INCS) -c $< -o $@
+	@$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
 
 -include obj/*.d