summaryrefslogtreecommitdiff
path: root/tools/jsonproc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-08 09:58:38 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-08 09:58:38 -0400
commit5c0506f11462affc7319f28e2e27eb71d532fcf3 (patch)
treefbfad0b378a6214fa37d588802c4b1dba6412272 /tools/jsonproc
parentd0b478e833f45cc9d35e19eecefec5b19c97e1c5 (diff)
parent7594546ee990c55b5427a7f5bfc62263dc53ae5f (diff)
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'tools/jsonproc')
-rw-r--r--tools/jsonproc/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile
index 721da102..622f00ab 100644
--- a/tools/jsonproc/Makefile
+++ b/tools/jsonproc/Makefile
@@ -1,5 +1,3 @@
-CXX := g++
-
CXXFLAGS := -Wall -std=c++11 -O2
INCLUDES := -I .