From a4c475a26ca6b452ce23e0c25dae8606b1c6a653 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 27 Aug 2015 14:56:02 +0200 Subject: [PATCH 1/2] Linux/Makefile: Add preliminary NAOMI support --- shell/linux/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/shell/linux/Makefile b/shell/linux/Makefile index 673bae45d..69769c422 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -264,8 +264,14 @@ OBJECTS:=$(OBJECTS:.S=.build_obj) OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj-$(platform)/%,$(OBJECTS)) EXECUTABLE_STRIPPED=nosym-reicast.elf -EXECUTABLE=reicast.elf -EXECUTABLE_NAME=reicast +ifdef NAOMI + CFLAGS += -D TARGET_NAOMI + EXECUTABLE=reicast_naomi.elf + EXECUTABLE_NAME=reicast-naomi +else + EXECUTABLE=reicast.elf + EXECUTABLE_NAME=reicast +endif all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED) ifneq (,$(findstring gcwz,$(platform))) From dc921249cf4ac59659fae540c308b1e424bd2bad Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 28 Aug 2015 04:13:42 +0200 Subject: [PATCH 2/2] Linux/Makefile: Use different folder for NAOMI object files --- shell/linux/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/shell/linux/Makefile b/shell/linux/Makefile index 69769c422..e5d76e8e8 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -257,21 +257,22 @@ else LIBS += -ldl -lGL #for desktop gl endif +EXECUTABLE_STRIPPED=nosym-reicast.elf +ifdef NAOMI + CFLAGS += -D TARGET_NAOMI + DC_PLATFORM=naomi + EXECUTABLE=reicast_naomi.elf + EXECUTABLE_NAME=reicast-naomi +else + DC_PLATFORM=dreamcast + EXECUTABLE=reicast.elf + EXECUTABLE_NAME=reicast +endif OBJECTS=$(RZDCY_FILES:.cpp=.build_obj) OBJECTS:=$(OBJECTS:.c=.build_obj) OBJECTS:=$(OBJECTS:.S=.build_obj) -OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj-$(platform)/%,$(OBJECTS)) - -EXECUTABLE_STRIPPED=nosym-reicast.elf -ifdef NAOMI - CFLAGS += -D TARGET_NAOMI - EXECUTABLE=reicast_naomi.elf - EXECUTABLE_NAME=reicast-naomi -else - EXECUTABLE=reicast.elf - EXECUTABLE_NAME=reicast -endif +OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj-$(DC_PLATFORM)-$(platform)/%,$(OBJECTS)) all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED) ifneq (,$(findstring gcwz,$(platform)))