Fixed controller profile system.

[virtualjaguar] / jaguarcore.mak

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 89faa3bad1e42c1779da55d6a5a3520772aaf89a..31bd4a822cb0006b68bbe5c969179201e557768b 100644 (file)
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -33,6 +33,11 @@ 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
 
@@ -58,15 +63,9 @@ 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 = `$(CROSS)sdl-config --cflags`
 DEFINES = -D$(SYSTYPE)
-GCC_DEPS = "-MMD"
+GCC_DEPS = -MMD
 
 INCS := -I./src
 
@@ -83,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 \
@@ -117,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