diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 09:58:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-08 09:58:38 -0400 |
| commit | 5c0506f11462affc7319f28e2e27eb71d532fcf3 (patch) | |
| tree | fbfad0b378a6214fa37d588802c4b1dba6412272 /tools | |
| parent | d0b478e833f45cc9d35e19eecefec5b19c97e1c5 (diff) | |
| parent | 7594546ee990c55b5427a7f5bfc62263dc53ae5f (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jsonproc/Makefile | 2 | ||||
| -rw-r--r-- | tools/knarc/Makefile | 2 | ||||
| -rw-r--r-- | tools/narccomp/Makefile | 1 | ||||
| -rw-r--r-- | tools/scaninc/Makefile | 2 |
4 files changed, 0 insertions, 7 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 . diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile index 2e851af6..62af834f 100644 --- a/tools/knarc/Makefile +++ b/tools/knarc/Makefile @@ -1,5 +1,3 @@ -CXX := g++ - CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs SRCS := Source.cpp Narc.cpp diff --git a/tools/narccomp/Makefile b/tools/narccomp/Makefile index b484e7a1..6b404f32 100644 --- a/tools/narccomp/Makefile +++ b/tools/narccomp/Makefile @@ -1,4 +1,3 @@ -CXX = g++ CXXFLAGS := -O3 -std=c++11 .PHONY: all clean diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile index 1516f159..6168acd6 100644 --- a/tools/scaninc/Makefile +++ b/tools/scaninc/Makefile @@ -1,5 +1,3 @@ -CXX = g++ - CXXFLAGS = -Wall -Werror -std=c++11 -O2 SRCS = scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp |