convert mapjson.py to mapjson.cpp

iriv24 · Feb 3, 2019 · 82abc16 · 82abc16
1 parent 29d6221
commit 82abc16
Show file tree

Hide file tree

Showing 8 changed files with 1,592 additions and 390 deletions.
diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE)
 PREPROC := tools/preproc/preproc$(EXE)
 RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
 FIX := tools/gbafix/gbafix$(EXE)
-MAPJSON := python tools/mapjson/mapjson.py
+MAPJSON := tools/mapjson/mapjson$(EXE)
 
 # Clear the default suffixes
 .SUFFIXES:

diff --git a/build_tools.sh b/build_tools.sh
@@ -8,3 +8,4 @@ make -C tools/aif2pcm CXX=${1:-g++}
 make -C tools/ramscrgen CXX=${1:-g++}
 make -C tools/gbafix CXX=${1:-g++}
 make -C tools/mid2agb CXX=${1:-g++}
+make -C tools/mapjson CXX=${1:-g++}
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile
@@ -0,0 +1,15 @@
+CXX := g++
+
+CXXFLAGS := -Wall -std=c++11 -O2
+
+SRCS := json11.cpp mapjson.cpp
+
+HEADERS := mapjson.h
+
+.PHONY: clean
+
+mapjson: $(SRCS) $(HEADERS)
+	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
+
+clean:
+	$(RM) mapjson mapjson.exe