diff --git a/Makefile b/Makefile index fb447785..325976b0 100644 --- a/Makefile +++ b/Makefile @@ -1,27 +1,24 @@ REGION ?= EUR ifeq ($(REGION), EUR) - BUILD_SUBDIR := eur -else ifeq ($(REGION), USA) - BUILD_SUBDIR := usa -else ifeq ($(REGION), JPN) - BUILD_SUBDIR := jpn + TARGET_SUBDIR := eur else $(error Unknown region '$(REGION)') endif -ROOT := $(shell pwd) -BUILD_DIR := $(ROOT)/build/$(BUILD_SUBDIR) -TOOLS_DIR := $(ROOT)/tools -LCF_FILE := $(BUILD_DIR)/arm9_linker_script.lcf -OBJS_FILE := $(BUILD_DIR)/arm9_objects.txt +ROOT := $(shell pwd) +BUILD_DIR := $(ROOT)/build +TARGET_DIR := $(BUILD_DIR)/$(TARGET_SUBDIR) +TOOLS_DIR := $(ROOT)/tools +LCF_FILE := $(BUILD_DIR)/arm9_linker_script.lcf +OBJS_FILE := $(BUILD_DIR)/arm9_objects.txt ASM_FILES := $(wildcard asm/*.s) CXX_FILES := $(wildcard src/*.cpp) -ASM_OBJS = $(ASM_FILES:%.s=$(BUILD_DIR)/%.o) -CXX_OBJS = $(CXX_FILES:%.cpp=$(BUILD_DIR)/%.o) +ASM_OBJS = $(ASM_FILES:%.s=$(TARGET_DIR)/%.o) +CXX_OBJS = $(CXX_FILES:%.cpp=$(TARGET_DIR)/%.o) -OV_BINS := $(wildcard $(BUILD_DIR)/overlays/*.bin) +OV_BINS := $(wildcard $(TARGET_DIR)/overlays/*.bin) OV_LZS = $(OV_BINS:%.bin=%.lz) MW_VER := 2.0/sp1p5 @@ -47,7 +44,7 @@ arm9: setup $(ASM_OBJS) lcf link .PHONY: setup setup: - mkdir -p $(BUILD_DIR)/overlays + mkdir -p $(TARGET_DIR)/overlays .PHONY: clean clean: @@ -57,21 +54,21 @@ clean: lcf: $(TOOLS_DIR)/lcf.py python $(TOOLS_DIR)/lcf.py -$(ASM_OBJS): $(BUILD_DIR)/%.o: %.s +$(ASM_OBJS): $(TARGET_DIR)/%.o: %.s mkdir -p $(dir $@) $(MW_ASM) $(ASM_FLAGS) $< -o $@ -$(CXX_OBJS): $(BUILD_DIR)/%.o: %.cpp +$(CXX_OBJS): $(TARGET_DIR)/%.o: %.cpp mkdir -o $(dir $@) $(MW_CC) $(CC_FLAGS) $< -o $@ .PHONY: link link: - cd $(BUILD_DIR) && LM_LICENSE_FILE=$(MW_LICENSE) $(MW_LD) $(LD_FLAGS) $(LCF_FILE) @$(OBJS_FILE) + cd $(TARGET_DIR) && LM_LICENSE_FILE=$(MW_LICENSE) $(MW_LD) $(LD_FLAGS) $(LCF_FILE) @$(OBJS_FILE) .PHONY: compress compress: $(OV_LZS) - $(TOOLS_DIR)/compress/compress -s 0x4000 -i $(BUILD_DIR)/arm9.bin -o $(BUILD_DIR)/arm9.lz + $(TOOLS_DIR)/compress/compress -s 0x4000 -i $(TARGET_DIR)/arm9.bin -o $(TARGET_DIR)/arm9.lz $(OV_LZS): %.lz: %.bin $(TOOLS_DIR)/compress/compress -p -i $< -o $@