Finally, we have 2.1.1. :-D

[virtualjaguar] / jaguarcore.mak

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 1bcafe0e1baec2b0737fcc46d5a3839dc852a263..9d44b4193375c4a5c5451b8d7482c12b00bb49ee 100644 (file)
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -7,33 +7,24 @@
 # file GPLv3 for details. ;-)
 #
 
-# Figure out which system we're compiling for, and set the appropriate variables
-
-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
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
 
-# Linux
-else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
+# Cross compilation with MXE
+#CROSS = i686-pc-mingw32-
 
 SYSTYPE    := __GCCUNIX__
-SDLLIBTYPE := --libs
 
-# ??? Throw error, unknown OS
+ifneq "$(CROSS)" ""
+SYSTYPE    := __GCCWIN32__
 else
-
-$(error OS TYPE UNDETECTED)
-
+OSTYPE := $(shell uname -o)
+ifeq "$(OSTYPE)" "Msys"
+SYSTYPE    := __GCCWIN32__
+endif
 endif
 
 # Set vars for libcdio
@@ -45,20 +36,14 @@ HAVECDIO :=
 CDIOLIB  :=
 endif
 
-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 ?= -O2 -ffast-math -fomit-frame-pointer
-CXXFLAGS ?= -O2 -ffast-math -fomit-frame-pointer
+CC      := $(CROSS)gcc
+LD      := $(CROSS)gcc
+AR      := $(CROSS)ar
+ARFLAGS := -rs
 
-SDL_CFLAGS = `sdl-config --cflags`
+SDL_CFLAGS = `$(CROSS)sdl-config --cflags`
 DEFINES = -D$(SYSTYPE)
-GCC_DEPS = "-MMD"
+GCC_DEPS = -MMD
 
 INCS := -I./src
 
@@ -75,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 \
@@ -105,18 +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/%.c
-       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-#      @$(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) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
+       $(Q)$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
 
 -include obj/*.d