From 409e63e1e54af42856b5387550e3e2a479e84a99 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 7 Dec 2010 18:25:50 +0000
Subject: *** empty log message ***

---
 src/x11/cdx11.c |  3 ++-
 tecmake.mak     | 10 +++++++---
 tecmakewin.mak  |  6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/x11/cdx11.c b/src/x11/cdx11.c
index 8c59d48..705d256 100644
--- a/src/x11/cdx11.c
+++ b/src/x11/cdx11.c
@@ -70,7 +70,8 @@ static void update_colors(cdCtxCanvas *ctxcanvas)
 static int find_color(cdCtxCanvas *ctxcanvas, XColor* xc1)
 {
   int pos = 0, i;
-  unsigned long min_dist = ULONG_MAX, this_dist;
+  unsigned long min_dist = ULONG_MAX, /* just a very big value */
+    this_dist;
   int dr, dg, db;
   XColor* xc2;
 
diff --git a/tecmake.mak b/tecmake.mak
index 7076511..da9819e 100644
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -949,6 +949,8 @@ ifdef USE_GTK
     # get compile/link flags via pkg-config
     STDFLAGS += $(shell pkg-config --cflags gtk+-2.0 gdk-2.0)
     LIBS += $(shell pkg-config --libs gtk+-2.0 gdk-2.0)
+    GTK_BASE := $(shell pkg-config --variable=prefix gtk+-2.0)
+    GTK := $(GTK_BASE)    
   else
     CHECK_GTK = Yes
     ifneq ($(findstring MacOS, $(TEC_UNAME)), )
@@ -982,7 +984,7 @@ ifdef USE_GTK
     endif
 
     LIBS += gdk_pixbuf-2.0 pango-1.0 gobject-2.0 gmodule-2.0 glib-2.0
-    STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/gdk-pixbuf-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0
+    STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0
 
     ifeq ($(TEC_SYSARCH), x64)
       STDINCS += $(GTK)/lib64/glib-2.0/include $(GTK)/lib64/gtk-2.0/include
@@ -1022,8 +1024,10 @@ LIBS += m
 ifneq ($(findstring cygw, $(TEC_UNAME)), )
   WIN_OTHER := Yes
 
+  DEPINCS := $(INCLUDES) $(EXTRAINCS)
+  
   # INCLUDES for dependencies, remove references to "c:" and similars
-  DEPINCS := $(patsubst c:%, /cygdrive/c%, $(INCLUDES))
+  DEPINCS := $(patsubst c:%, /cygdrive/c%, $(DEPINCS))
   DEPINCS := $(patsubst d:%, /cygdrive/d%, $(DEPINCS))
   DEPINCS := $(patsubst x:%, /cygdrive/x%, $(DEPINCS))
   DEPINCS := $(patsubst t:%, /cygdrive/t%, $(DEPINCS))
@@ -1039,7 +1043,7 @@ endif
 #---------------------------------#
 #  Building compilation flags that are sets
 
-DEPINCS ?= $(INCLUDES)
+DEPINCS ?= $(INCLUDES) $(EXTRAINCS)
 DEPINCS := $(addprefix -I, $(DEPINCS))
 
 INCLUDES := $(addprefix -I, $(INCLUDES))
diff --git a/tecmakewin.mak b/tecmakewin.mak
index 25fa23c..4e87c3c 100644
--- a/tecmakewin.mak
+++ b/tecmakewin.mak
@@ -984,7 +984,7 @@ ifdef USE_OPENGL
 endif
 
 ifdef USE_GTK
-  STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/gdk-pixbuf-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include
+  STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-2.0 $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib/gtk-2.0/include
   ifeq "$(TEC_CC)" "gcc"
     STDFLAGS += -mms-bitfields
   endif
@@ -1004,8 +1004,10 @@ endif
 #---------------------------------#
 #  Building compilation flags that are sets
 
+DEPINCS := $(INCLUDES) $(EXTRAINCS)
+
 # INCLUDES for dependencies, remove references to "c:" and similars
-DEPINCS := $(patsubst c:%, /cygdrive/c%, $(INCLUDES))
+DEPINCS := $(patsubst c:%, /cygdrive/c%, $(DEPINCS))
 DEPINCS := $(patsubst d:%, /cygdrive/d%, $(DEPINCS))
 DEPINCS := $(patsubst x:%, /cygdrive/x%, $(DEPINCS))
 DEPINCS := $(patsubst t:%, /cygdrive/t%, $(DEPINCS))
-- 
cgit v1.2.3