diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 13:29:02 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 13:29:02 -0500 |
| commit | cc5db41f30708c1cc2d33a46879c96a9404764a3 (patch) | |
| tree | d59ba2fd880b8eb47ab7e1a5885d067b028598ff /map_data_rules.mk | |
| parent | aad94c34334ee44f1298175df38f14dc27ae5fb8 (diff) | |
Revert multiple source change commits for rebase.
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 626cd4724..0203b383d 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 |