The -d command line option, dedicated to the debugger, has been renamed to avoid...

[clinton/Virtual-Jaguar-Rx.git] / jaguarcore.mak

diff --git a/jaguarcore.mak b/jaguarcore.mak
index a90bb18..aa4971e 100644 (file)
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -1,103 +1,100 @@
-#
-# Makefile for Virtual Jaguar core library
-#
-# by James Hammons
-#
-# This software is licensed under the GPL v3 or any later version. See the
-# file GPLv3 for details. ;-)
-#
-
-ifeq ("$(V)","1")
-Q :=
-else
-Q := @
-endif
-
-# Cross compilation with MXE
-#CROSS = i686-pc-mingw32-
-
-SYSTYPE    := __GCCUNIX__
-
-ifneq "$(CROSS)" ""
-SYSTYPE    := __GCCWIN32__
-else
-OSTYPE := $(shell uname -o)
-ifeq "$(OSTYPE)" "Msys"
-SYSTYPE    := __GCCWIN32__
-endif
-endif
-
-# Set vars for libcdio
-ifneq "$(shell pkg-config --silence-errors --libs libcdio)" ""
-HAVECDIO := -DHAVE_LIB_CDIO
-CDIOLIB  := -lcdio
-else
-HAVECDIO :=
-CDIOLIB  :=
-endif
-
-CC      := $(CROSS)gcc
-LD      := $(CROSS)gcc
-AR      := $(CROSS)ar
-ARFLAGS := -rs
-
-SDL_CFLAGS = `$(CROSS)sdl-config --cflags`
-DEFINES = -D$(SYSTYPE)
-GCC_DEPS = -MMD
-
-INCS := -I./src
-
-OBJS := \
-       obj/blitter.o      \
-       obj/cdintf.o       \
-       obj/cdrom.o        \
-       obj/crc32.o        \
-       obj/dac.o          \
-       obj/dsp.o          \
-       obj/eeprom.o       \
-       obj/event.o        \
-       obj/file.o         \
-       obj/filedb.o       \
-       obj/gpu.o          \
-       obj/jagbios.o      \
-       obj/jagbios2.o     \
-       obj/jagcdbios.o    \
-       obj/jagdevcdbios.o \
-       obj/jagstub1bios.o \
-       obj/jagstub2bios.o \
-       obj/jagdasm.o      \
-       obj/jaguar.o       \
-       obj/jerry.o        \
-       obj/joystick.o     \
-       obj/log.o          \
-       obj/memory.o       \
-       obj/memtrack.o     \
-       obj/mmu.o          \
-       obj/op.o           \
-       obj/settings.o     \
-       obj/state.o        \
-       obj/tom.o          \
-       obj/universalhdr.o \
-       obj/unzip.o        \
-       obj/wavetable.o
-
-# Targets for convenience sake, not "real" targets
-.PHONY: clean
-
-all: obj obj/libjaguarcore.a
-       @echo "Done!"
-
-obj:
-       @mkdir obj
-
-# Library rules (might not be cross-platform compatible)
-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"
-       $(Q)$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@
-
--include obj/*.d
+#\r
+# Makefile for Virtual Jaguar core library\r
+#\r
+# by James Hammons\r
+# Modified by Jean-Paul Mari\r
+#\r
+# This software is licensed under the GPL v3 or any later version. See the\r
+# file LICENSE file for details. ;-)\r
+#\r
+\r
+ifeq ("$(V)","1")\r
+Q :=\r
+else\r
+Q := @\r
+endif\r
+\r
+# Cross compilation with MXE\r
+#CROSS = i686-pc-mingw32-\r
+\r
+SYSTYPE    := __GCCUNIX__\r
+\r
+ifneq "$(CROSS)" ""\r
+SYSTYPE    := __GCCWIN32__\r
+else\r
+OSTYPE := $(shell uname -o)\r
+ifeq "$(OSTYPE)" "Msys"\r
+SYSTYPE    := __GCCWIN32__\r
+endif\r
+endif\r
+\r
+# Set vars for libcdio\r
+ifneq "$(shell pkg-config --silence-errors --libs libcdio)" ""\r
+HAVECDIO := -DHAVE_LIB_CDIO\r
+CDIOLIB  := -lcdio\r
+else\r
+HAVECDIO :=\r
+CDIOLIB  :=\r
+endif\r
+\r
+CC      := $(CROSS)gcc\r
+LD      := $(CROSS)gcc\r
+AR      := $(CROSS)ar\r
+ARFLAGS := -rs\r
+\r
+SDL_CFLAGS = `$(CROSS)sdl-config --cflags`\r
+DEFINES = -D$(SYSTYPE)\r
+GCC_DEPS = -MMD\r
+\r
+INCS := -I./src\r
+\r
+OBJS := \\r
+       obj/blitter.o      \\r
+       obj/cdintf.o       \\r
+       obj/cdrom.o        \\r
+       obj/dac.o          \\r
+       obj/dsp.o          \\r
+       obj/eeprom.o       \\r
+       obj/event.o        \\r
+       obj/filedb.o       \\r
+       obj/gpu.o          \\r
+       obj/jagbios.o      \\r
+       obj/jagbios2.o     \\r
+       obj/jagcdbios.o    \\r
+       obj/jagdevcdbios.o \\r
+       obj/jagstub1bios.o \\r
+       obj/jagstub2bios.o \\r
+       obj/jagdasm.o      \\r
+       obj/jaguar.o       \\r
+       obj/jerry.o        \\r
+       obj/joystick.o     \\r
+       obj/memory.o       \\r
+       obj/memtrack.o     \\r
+       obj/mmu.o          \\r
+       obj/modelsBIOS.o   \\r
+       obj/op.o           \\r
+       obj/state.o        \\r
+       obj/tom.o          \\r
+       obj/universalhdr.o \\r
+       obj/wavetable.o\r
+\r
+# Targets for convenience sake, not "real" targets\r
+.PHONY: clean\r
+\r
+all: obj obj/libjaguarcore.a\r
+       @echo "Done!"\r
+\r
+obj:\r
+       @mkdir obj\r
+\r
+# Library rules (might not be cross-platform compatible)\r
+obj/libjaguarcore.a: $(OBJS) \r
+       $(Q)$(AR) $(ARFLAGS) obj/libjaguarcore.a $(OBJS)\r
+\r
+# Main source compilation (implicit rules)...\r
+\r
+obj/%.o: src/%.cpp\r
+       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"\r
+       $(Q)$(CC) $(GCC_DEPS) $(CXXFLAGS) $(SDL_CFLAGS) $(DEFINES) $(INCS) -c $< -o $@\r
+\r
+-include obj/*.d\r