diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-02-04 17:28:45 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-02-04 17:28:45 -0600 |
| commit | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (patch) | |
| tree | 1ba1856aecc9a47fc4e91cb320cf662558b95b7e /map_data_rules.mk | |
| parent | 82abc164dc9f6a74fdf0c535cc1621b7ed05318b (diff) | |
Cleanup and add game version flag to mapjson tool
Diffstat (limited to 'map_data_rules.mk')
| -rwxr-xr-x | map_data_rules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/map_data_rules.mk b/map_data_rules.mk index 6d133eb50..5a7d9dd84 100755 --- a/map_data_rules.mk +++ b/map_data_rules.mk @@ -14,18 +14,18 @@ $(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/e $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ $(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json - $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.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 $< + $(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 $< + $(MAPJSON) layouts emerald $< $(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; |