diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2013-07-21 20:13:58 +1000 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-07-21 20:13:58 +1000 |
| commit | b70f7b0bada5e9e60d8e6b5d6c6887a18a926303 (patch) | |
| tree | 6ab805cf0668d8ab770730cf8ae801fbc9688071 | |
| parent | ba5296ed79ec28ca2628cad9e609e6151d456282 (diff) | |
| download | scintilla-mirror-b70f7b0bada5e9e60d8e6b5d6c6887a18a926303.tar.gz | |
Separating out C and C++ flags so that Clang works agin for C files.
| -rw-r--r-- | gtk/makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/makefile b/gtk/makefile index 895e83696..cbf89106e 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -46,7 +46,7 @@ INCLUDEDIRS=-I ../include -I ../src -I ../lexlib ifdef CHECK_DEPRECATED DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT endif -CXXBASEFLAGS=--std=c++0x -Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) ifdef NOTHREADS THREADFLAGS=-DG_THREADS_IMPL_NONE @@ -56,15 +56,16 @@ endif ifdef DEBUG ifdef CLANG -CXXTFLAGS=-DDEBUG -g -fsanitize=address $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g -fsanitize=address $(CXXBASEFLAGS) $(THREADFLAGS) else -CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) endif else -CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CFLAGS:=$(CXXTFLAGS) +CFLAGS:=$(CTFLAGS) +CXXTFLAGS:=--std=c++0x $(CTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o |