And then there was 2.1.2. :-P

[virtualjaguar] / jaguarcore.mak

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 0c94a5c9fdacb22b80901597d162ee6af93354c5..9d44b4193375c4a5c5451b8d7482c12b00bb49ee 100644 (file)
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -7,41 +7,24 @@
 # file GPLv3 for details. ;-)
 #
 
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
 # Cross compilation with MXE
 #CROSS = i686-pc-mingw32-
 
-# Figure out which system we're compiling for, and set the appropriate variables
-
-ifeq "$(CROSS)" ""
-OSTYPE := $(shell uname -a)
-
-# Win32
-ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
-
-SYSTYPE    := __GCCWIN32__
-SDLLIBTYPE := --libs
-
-# Apple. Should catch both 'darwin' and 'darwin7.0'
-else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
-
-SYSTYPE    := __GCCUNIX__ -D__THINK_STUPID__
-SDLLIBTYPE := --static-libs
-
-# Linux
-else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
-
 SYSTYPE    := __GCCUNIX__
-SDLLIBTYPE := --libs
-
-# ??? Throw error, unknown OS
-else
 
-$(error OS TYPE UNDETECTED)
-
-endif
+ifneq "$(CROSS)" ""
+SYSTYPE    := __GCCWIN32__
 else
+OSTYPE := $(shell uname -o)
+ifeq "$(OSTYPE)" "Msys"
 SYSTYPE    := __GCCWIN32__
-SDLLIBTYPE := --libs
+endif
 endif
 
 # Set vars for libcdio
@@ -77,6 +60,7 @@ OBJS := \
        obj/filedb.o       \
        obj/gpu.o          \
        obj/jagbios.o      \
+       obj/jagbios2.o     \
        obj/jagcdbios.o    \
        obj/jagdevcdbios.o \
        obj/jagstub1bios.o \
@@ -107,12 +91,12 @@ obj:
 
 # Library rules (might not be cross-platform compatible)
 obj/libjaguarcore.a: $(OBJS) 
-       @$(AR) $(ARFLAGS) obj/libjaguarcore.a $(OBJS)
+       $(Q)$(AR) $(ARFLAGS) obj/libjaguarcore.a $(OBJS)
 
 # Main source compilation (implicit rules)...
 
 obj/%.o: src/%.cpp
        @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-       @$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
+       $(Q)$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
 
 -include obj/*.d