diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /tools/preproc | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
Diffstat (limited to 'tools/preproc')
| -rw-r--r-- | tools/preproc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile index 1f4c58e21..ec4a5f365 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -1,6 +1,6 @@ CXX := g++ -CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch +CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ utf8.cpp |