From 185bbfa2aa2cf81305c98c61e5c8849c15d36bb3 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sun, 1 May 2011 13:53:10 +1000
Subject: Enable building for GTK+ 3.0 with "make GTK3=1".

---
 gtk/makefile | 12 ++++++++++--
 1 file 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))))
 
-- 
cgit v1.2.3