diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-23 11:06:53 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-23 11:06:53 +1000 |
| commit | f0a4dd3186dcbabecb9afa145ce577238a3bda3f (patch) | |
| tree | a040df03ea2284af1fbc432bc4014be9b75c0240 | |
| parent | a4d5f8962bbdcf1ef6f95aad85a3bd47dc0fa6fe (diff) | |
| download | scintilla-mirror-f0a4dd3186dcbabecb9afa145ce577238a3bda3f.tar.gz | |
Backport: Lexer style metadata uses arrays of struct literals but don't want noise of
extra braces for each element so turn off warning.
Backport of changeset 6360:ff0e3efc436c.
| -rw-r--r-- | gtk/makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile index a987d6be1..db7ae1c2d 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 |