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

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 1bcafe0..31bd4a8 100644
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -7,8 +7,12 @@
 # file GPLv3 for details. ;-)
 #
 
+# 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
@@ -29,11 +33,20 @@ else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
 SYSTYPE    := __GCCUNIX__
 SDLLIBTYPE := --libs
 
+else ifeq "$(findstring kFreeBSD,$(OSTYPE))" "kFreeBSD"
+
+SYSTYPE    := __GCCUNIX__
+SDLLIBTYPE := --libs
+
 # ??? Throw error, unknown OS
 else
 
 $(error OS TYPE UNDETECTED)
 
+endif
+else
+SYSTYPE    := __GCCWIN32__
+SDLLIBTYPE := --libs
 endif
 
 # Set vars for libcdio
@@ -45,20 +58,14 @@ HAVECDIO :=
 CDIOLIB  :=
 endif
 
-CC       := gcc
-LD       := gcc
-AR       := ar
-ARFLAGS  := -rs
+CC      := $(CROSS)gcc
+LD      := $(CROSS)gcc
+AR      := $(CROSS)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
-
-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 +82,7 @@ OBJS := \
 	obj/filedb.o       \
 	obj/gpu.o          \
 	obj/jagbios.o      \
+	obj/jagbios2.o     \
 	obj/jagcdbios.o    \
 	obj/jagdevcdbios.o \
 	obj/jagstub1bios.o \
@@ -109,14 +117,8 @@ 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 $@
 
 -include obj/*.d