diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /tools/preproc | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
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 |