summaryrefslogtreecommitdiff
path: root/tools/mapjson
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2019-09-04 13:18:49 -0700
committerDiegoisawesome <diego@domoreaweso.me>2019-09-04 13:18:49 -0700
commita7ef6c4cbf5ef481281917685a633ccd842335d5 (patch)
tree44674b0580f41426eb5112e31cdc0245237d1666 /tools/mapjson
parent1ec2c86089fd933a46ef405da63c131aee52d7e0 (diff)
Update tool sources and binaries from pokeemeraldHEADmaster
Diffstat (limited to 'tools/mapjson')
-rw-r--r--tools/mapjson/Makefile2
-rwxr-xr-xtools/mapjson/mapjson.exebin2951145 -> 2951145 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile
index 9a49be5..c1f703f 100644
--- a/tools/mapjson/Makefile
+++ b/tools/mapjson/Makefile
@@ -1,4 +1,4 @@
-CXX := g++
+CXX ?= g++
CXXFLAGS := -Wall -std=c++11 -O2
diff --git a/tools/mapjson/mapjson.exe b/tools/mapjson/mapjson.exe
index b49d5c6..d1af7cb 100755
--- a/tools/mapjson/mapjson.exe
+++ b/tools/mapjson/mapjson.exe
Binary files differ