diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-02 14:08:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 14:08:10 -0400 |
| commit | bd5cf070597e9c9d175777832859ed0c64fe7760 (patch) | |
| tree | 4dda9e759cbb4cf0c061c24a83832c59277f7d53 /map_data_rules.mk | |
| parent | 06b909bcd80e5b3f882273a317ac957cd57f07a5 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-playerpc
Diffstat (limited to 'map_data_rules.mk')
| -rwxr-xr-x | map_data_rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/map_data_rules.mk b/map_data_rules.mk index 0203b383d..626cd4724 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -9,9 +9,9 @@ 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 $@ + $(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 $@ + $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@ $(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json $(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json |