summaryrefslogtreecommitdiff
path: root/map_data_rules.mk
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 21:24:44 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 21:24:44 -0500
commit3d686116d8acb9f3daa1db9669de6eca11a861d5 (patch)
tree6b85da1107d36ec37c33bbca7fd55a97d071db67 /map_data_rules.mk
parent5a5acfb0ada48c89d1e398dea3fd3ef701213b60 (diff)
[Round 3] Apply all source related changes for the new INSTALL.md in one commit.
Diffstat (limited to 'map_data_rules.mk')
-rwxr-xr-xmap_data_rules.mk4
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