mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
18902219ad
Currently, when Make is building the maps, it considers every folder in the data/maps/ directory as a map that needs to be built, even folders that are empty. This can be a problem when modding on a separate branch, because git doesn't always clean up directories when switching branches (usually because of hidden files in those directories), so switching back to an unmodded branch will leave an empty folder that confuses make. This commit changes the makefile so that it only checks directories that have map.json files in them.
32 lines
1.6 KiB
Makefile
Executable File
32 lines
1.6 KiB
Makefile
Executable File
# Map JSON data
|
|
|
|
MAPS_DIR = $(DATA_ASM_SUBDIR)/maps
|
|
LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts
|
|
|
|
MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json))
|
|
MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS))
|
|
MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS))
|
|
MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS))
|
|
|
|
$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS)
|
|
$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
|
|
$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS)
|
|
$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
|
|
|
|
$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json
|
|
$(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json
|
|
$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ;
|
|
$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ;
|
|
|
|
$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json
|
|
$(MAPJSON) groups emerald $<
|
|
$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ;
|
|
$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ;
|
|
$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ;
|
|
include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ;
|
|
|
|
$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json
|
|
$(MAPJSON) layouts emerald $<
|
|
$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ;
|
|
include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ;
|