diff options
| author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
|---|---|---|
| committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
| commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
| tree | fac5bee8a4ce4757816dbbe42265523478b78781 /map_data_rules.mk | |
| parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
| parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) | |
Merge remote-tracking branch 'pret/master'
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 |