diff options
| author | nyamatongwe <devnull@localhost> | 2011-05-01 13:53:10 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-05-01 13:53:10 +1000 |
| commit | ae0ea48c0405c70c6b82bef7a7d95cb993e17cb3 (patch) | |
| tree | f07a7289d348ecc8236682ab9c69607cd90d177b | |
| parent | 6c97f9c411593118bfd807b8a1b8370b17120454 (diff) | |
| download | scintilla-mirror-ae0ea48c0405c70c6b82bef7a7d95cb993e17cb3.tar.gz | |
Enable building for GTK+ 3.0 with "make GTK3=1".
| -rw-r--r-- | gtk/makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile index d38fa9d3c..e5faa6fd9 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -17,6 +17,12 @@ endif AR = ar RANLIB = touch +ifdef GTK3 +GTKVERSION=gtk+-3.0 +else +GTKVERSION=gtk+-2.0 +endif + # Environment variable windir always defined on Win32 ifndef windir @@ -54,13 +60,15 @@ else CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) +CFLAGS:=$(CXXFLAGS) + +CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o .cxx.o: $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< .c.o: - $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $< + $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $< LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) |