aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <unknown>2016-08-11 14:50:36 +1000
committerNeil Hodgson <unknown>2016-08-11 14:50:36 +1000
commit599fea3bef25e5ee374be2a73833fe1afa440501 (patch)
treed4cdde7f7e680b19d40c9410d767846383b9fdd2
parent0b9eee5c81bd7dc86282eb21282282b65162aef5 (diff)
downloadscintilla-mirror-599fea3bef25e5ee374be2a73833fe1afa440501.tar.gz
Bug [#1844]. Allow setting CFLAGS for make.
-rw-r--r--gtk/makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 200ded12d..be3214b3c 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -74,7 +74,6 @@ else
CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
endif
-CFLAGS:=$(CTFLAGS)
CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
@@ -83,7 +82,7 @@ MARSHALLER=scintilla-marshal.o
.cxx.o:
$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
.c.o:
- $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
GLIB_GENMARSHAL = glib-genmarshal
GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal