diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /tools/mapjson | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'tools/mapjson')
| -rw-r--r-- | tools/mapjson/Makefile | 10 | ||||
| -rw-r--r-- | tools/mapjson/mapjson.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile index c1f703f9f..100e809c6 100644 --- a/tools/mapjson/Makefile +++ b/tools/mapjson/Makefile @@ -6,12 +6,18 @@ SRCS := json11.cpp mapjson.cpp HEADERS := mapjson.h +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + .PHONY: all clean -all: mapjson +all: mapjson$(EXE) @: -mapjson: $(SRCS) $(HEADERS) +mapjson$(EXE): $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) clean: diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 5e246ff24..d767b469e 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -395,7 +395,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) { int group_num = 0; for (auto &group : groups_data["group_order"].array_items()) { - text << "// Map Group " << group_num << "\n"; + text << "// " << group.string_value() << "\n"; vector<Json> map_ids; size_t max_length = 0; |