aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2013-01-26 11:18:08 +1100
committernyamatongwe <unknown>2013-01-26 11:18:08 +1100
commitccdea98d43545c473fbdece4698156aa88a9d1b6 (patch)
tree150f5ac932f87c58eb7641535d62d409a3ad84bf
parent1ef40955f38d6b70a53528a543f2c9bbc965f7bf (diff)
downloadscintilla-mirror-ccdea98d43545c473fbdece4698156aa88a9d1b6.tar.gz
Use CXXFLAGS for C++ only, not for C.
-rw-r--r--gtk/makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/makefile b/gtk/makefile
index e0c646c1f..c3ba18b73 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -58,9 +58,9 @@ THREADFLAGS=
endif
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXTFLAGS=-DNDEBUG -Os $(CXXFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
endif
CFLAGS:=$(CXXTFLAGS)
@@ -69,7 +69,7 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
MARSHALLER=scintilla-marshal.o
.cxx.o:
- $(CC) $(CONFIGFLAGS) $(CXXTFLAGS) -c $<
+ $(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
.c.o:
$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<