From cc230deb11b91957dcd656f150ffff698237f906 Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 25 Jun 2010 01:08:55 +0000 Subject: *** empty log message *** --- src/cdcairo.mak | 2 ++ src/cdcontextplus.mak | 1 + src/cdluacairo5.mak | 1 + src/cdluacontextplus5.mak | 5 +++++ src/config.mak | 1 + 5 files changed, 10 insertions(+) diff --git a/src/cdcairo.mak b/src/cdcairo.mak index 1d0e311..5938193 100644 --- a/src/cdcairo.mak +++ b/src/cdcairo.mak @@ -3,6 +3,7 @@ LIBNAME = cdcairo OPT = YES DEFINES = CD_NO_OLD_INTERFACE +CHECK_GTK = Yes INCLUDES = . cairo drv SRCDIR = cairo @@ -16,6 +17,7 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), ) else SRC += cdcaironative_x11.c DEFINES += CAIRO_X11 + CHECK_GTK = Yes endif INCLUDES += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0 $(GTK)/lib/glib-2.0/include diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak index 9cce04e..69aca36 100644 --- a/src/cdcontextplus.mak +++ b/src/cdcontextplus.mak @@ -16,6 +16,7 @@ else LIBS = Xrender Xft USE_X11 = Yes + CHECK_XRENDER = Yes INCLUDES = . sim drv freetype2 x11 endif diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak index 691046c..77963bc 100644 --- a/src/cdluacairo5.mak +++ b/src/cdluacairo5.mak @@ -7,6 +7,7 @@ DEFINES = CD_NO_OLD_INTERFACE SRCDIR = lua5 SRC = cdluacairo5.c DEF_FILE = cdluacairo5.def +CHECK_GTK = Yes ifneq ($(findstring Win, $(TEC_SYSNAME)), ) # In Win32 will work only for the Win32 base driver, diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak index 29dc446..16b7876 100644 --- a/src/cdluacontextplus5.mak +++ b/src/cdluacontextplus5.mak @@ -8,6 +8,11 @@ SRCDIR = lua5 SRC = cdluacontextplus5.c DEF_FILE = cdluacontextplus5.def +ifeq ($(findstring Win, $(TEC_SYSNAME)), ) + # Check for XRender availability if NOT Windows + CHECK_XRENDER = Yes +endif + LIBS = cdcontextplus ifdef USE_LUA52 diff --git a/src/config.mak b/src/config.mak index a88e831..c4d7a1e 100644 --- a/src/config.mak +++ b/src/config.mak @@ -64,6 +64,7 @@ INCLUDES = . drv x11 win32 intcgm freetype2 sim cairo ../include ifdef USE_GDK SRC += $(SRCGDK) $(SRCNULL) $(SRCCAIRO) USE_GTK = Yes + CHECK_GTK = Yes LIBS = pangocairo-1.0 cairo ifeq ($(findstring Win, $(TEC_SYSNAME)), ) SRC += cairo/cdcairoprn_unix.c -- cgit v1.2.3