summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2019-03-05 01:15:40 -0600
committerGitHub <noreply@github.com>2019-03-05 01:15:40 -0600
commitcb2922e7d7b39f0f6f5449691f86a4e3a73ec003 (patch)
tree8a2232832575b9fc989ab73d12f3523a976c7533
parentdeb555310d0feeae19058ea8ffdb06567d0e2e3e (diff)
parent18902219ad0a67f51a443e83973cfe3f03970101 (diff)
Merge pull request #603 from Phlosioneer/makefile-map-fix
Fix make to look for .json files instead of folders
-rwxr-xr-xmap_data_rules.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/map_data_rules.mk b/map_data_rules.mk
index 5a7d9dd84..0203b383d 100755
--- a/map_data_rules.mk
+++ b/map_data_rules.mk
@@ -3,7 +3,7 @@
MAPS_DIR = $(DATA_ASM_SUBDIR)/maps
LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts
-MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/))
+MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json))
MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS))
MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS))
MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS))