aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2017-07-23 11:06:53 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2017-07-23 11:06:53 +1000
commit1200e04d051f1bd479cffd4218d637240204d0f0 (patch)
tree65a7d1bf5ab830d5033cf8239dcf99df9273836d
parentb0a1aaa2eea6ab66939dce401da282938cad263e (diff)
downloadscintilla-mirror-1200e04d051f1bd479cffd4218d637240204d0f0.tar.gz
Lexer style metadata uses arrays of struct literals but don't want noise of
extra braces for each element so turn off warning.
-rw-r--r--gtk/makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 321b273a5..70d5aac9c 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -10,12 +10,15 @@ srcdir ?= .
.SUFFIXES: .cxx .c .o .h .a .list
ifdef CLANG
-CXX = clang++ -Wno-deprecated-register
+CXX = clang++
+CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
CC = clang
# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
# thread also need to create Position Independent Executable -> search online documentation
SANITIZE = address
#SANITIZE = undefined
+else
+CXXWARNFLAGS = -Wall -pedantic
endif
ARFLAGS = rc
RANLIB = touch
@@ -56,7 +59,7 @@ INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
-CXXBASEFLAGS=-Wall -pedantic $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE