From 1d720a28c6b3ba7d66efbc5ae72ed7bf60e0ac78 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Fri, 12 Nov 2010 00:40:04 +0000
Subject: *** empty log message ***

---
 src/cdcairo.mak           | 5 ++++-
 src/cdluacairo5.mak       | 2 +-
 src/cdluacontextplus5.mak | 2 +-
 src/cdluagl5.mak          | 2 +-
 src/cdluaim5.mak          | 4 ++--
 src/cdluapdf5.mak         | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/cdcairo.mak b/src/cdcairo.mak
index ccb393d..3ecfea9 100644
--- a/src/cdcairo.mak
+++ b/src/cdcairo.mak
@@ -19,12 +19,15 @@ else
   DEFINES += CAIRO_X11  
   CHECK_GTK = Yes
   
+  USE_X11 = Yes
+  
   ifdef GTK_DEFAULT
     CD_SUFFIX := x11
   endif
 endif
 
-INCLUDES += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include  
+# Can NOT use USE_GTK because gtk will be included for linking
+INCLUDES += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include $(GTK)/lib64/glib-2.0/include
 LDIR = $(GTK)/lib
 LIBS = pangocairo-1.0 cairo pango-1.0 gobject-2.0 glib-2.0
 
diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak
index 7ed4c14..ef3f9f8 100644
--- a/src/cdluacairo5.mak
+++ b/src/cdluacairo5.mak
@@ -34,11 +34,11 @@ else
 endif
 
 NO_LUALINK = Yes
-USE_CD = YES
 USE_CDLUA = YES
 CD = ..
 
 ifneq ($(findstring MacOS, $(TEC_UNAME)), )
+  USE_CD = YES
   USE_CDLUA:=
   INCLUDES += ../include
   LDIR = ../lib/$(TEC_UNAME)
diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak
index a94fae0..66760fc 100644
--- a/src/cdluacontextplus5.mak
+++ b/src/cdluacontextplus5.mak
@@ -28,11 +28,11 @@ else
 endif
 
 NO_LUALINK = Yes
-USE_CD = YES
 USE_CDLUA = YES
 CD = ..
 
 ifneq ($(findstring MacOS, $(TEC_UNAME)), )
+  USE_CD = YES
   USE_CDLUA:=
   INCLUDES += ../include
   LDIR = ../lib/$(TEC_UNAME)
diff --git a/src/cdluagl5.mak b/src/cdluagl5.mak
index 51e635b..dcef357 100644
--- a/src/cdluagl5.mak
+++ b/src/cdluagl5.mak
@@ -18,11 +18,11 @@ else
 endif
 
 NO_LUALINK = Yes
-USE_CD = YES
 USE_CDLUA = YES
 CD = ..
 
 ifneq ($(findstring MacOS, $(TEC_UNAME)), )
+  USE_CD = YES
   USE_CDLUA:=
   INCLUDES += ../include
   LDIR = ../lib/$(TEC_UNAME)
diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak
index 506eded..9c39f27 100644
--- a/src/cdluaim5.mak
+++ b/src/cdluaim5.mak
@@ -14,14 +14,14 @@ else
   LIBNAME := $(LIBNAME)51
 endif
 
-USE_CD = YES
 USE_CDLUA = YES
-USE_IM = YES
 USE_IMLUA = YES
 NO_LUALINK = Yes
 CD = ..
 
 ifneq ($(findstring MacOS, $(TEC_UNAME)), )
+  USE_IM = YES
+  USE_CD = YES
   USE_IMLUA:=
   USE_CDLUA:=
   INCLUDES += ../include $(IM)/include
diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak
index 94e807e..ee325c5 100644
--- a/src/cdluapdf5.mak
+++ b/src/cdluapdf5.mak
@@ -18,11 +18,11 @@ else
 endif
 
 NO_LUALINK = Yes
-USE_CD = YES
 USE_CDLUA = YES
 CD = ..
 
 ifneq ($(findstring MacOS, $(TEC_UNAME)), )
+  USE_CD = YES
   USE_CDLUA:=
   INCLUDES += ../include
   LDIR = ../lib/$(TEC_UNAME)
-- 
cgit v1.2.3