From 6620df9471268a72f0c58eddb99c0d612bca566e Mon Sep 17 00:00:00 2001
From: scuri
As an alternative you can use require"cdluacairo", but there are some restrictions: - in Windows only the GDI base driver can be used; in Linux only the X-Win base driver + in Windows only the GDI base driver can be used; in Linux only the GDK base +driver can be used; in other UNICES only the X-Win base driver can be used.
cd -> FreeType (included as separate library) cdwin* -> gdi32 user32 comdlg32 (system - Windows) cdx11* -> X11 (system - UNIX) - cdgdk* -> gdk-win32-2.0 pangowin32-1.0(system - Windows) + cdgdk+cdcairo* -> gdk-win32-2.0 pangowin32-1.0(system - Windows) -> gdk-x11-2.0 pangox-1.0 (system - UNIX) - -> cairo-2 gdk_pixbuf-2.0 pango-1.0 gobject-2.0 gmodule-2.0 glib-2.0 (system - Windows/UNIX) + -> cairo gdk_pixbuf-2.0 pango-1.0 gobject-2.0 gmodule-2.0 glib-2.0 (system - Windows/UNIX) cdgdiplus* -> cd -> gdiplus (system - Windows) cdxrender* -> cd -> Xrender Xft (system - UNIX) -cdcairo* -> cairo-2 (system - Windows/UNIX) +cdcairo -> pangocairo-1.0 cairo (system - Windows/UNIX) cdpdf -> pdflib (included as separate library) cdgl -> opengl32 (system - Windows) -> GL (system - UNIX) -> ftgl (included as separate library) cdlua51 -> cd -> lua5.1 +cdluacontextplus -> cdlua51 + -> cdcontextplus cdluaim51 -> cdlua51 -> imlua51 cdluapdf51 -> cdlua51 @@ -117,9 +119,9 @@ cdluapdf51 -> cdlua51 cdluagl51 -> cdlua51 -> cdgl -(*) In Windows, "cdwin" is called "cd". - In Linux and BSD "cdgdk" is called "cd". - In IRIX, AIX and SunOS "cdx11" is called "cd".+(*) In Windows, "cdwin" is called "cd", "cdgdiplus" is called "cdcontextplus". + In Linux and BSD "cdgdk+cdcairo" is called "cd", "cdxrender" is called "cdcontextplus". + In IRIX, AIX and SunOS "cdx11" is called "cd", "cdxrender" is called "cdcontextplus".
As a general rule (excluding system dependencies and included third party libraries): CD has NO external dependencies, and CDLua depends on Lua and IMLua. diff --git a/src/cdcairo.mak b/src/cdcairo.mak index 9b1b171..ccb393d 100644 --- a/src/cdcairo.mak +++ b/src/cdcairo.mak @@ -18,6 +18,10 @@ else SRC += cdcaironative_x11.c DEFINES += CAIRO_X11 CHECK_GTK = 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 diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak index e612452..7e11bba 100644 --- a/src/cdcontextplus.mak +++ b/src/cdcontextplus.mak @@ -18,6 +18,10 @@ else LIBS = Xrender Xft USE_X11 = Yes CHECK_XRENDER = Yes + + ifdef GTK_DEFAULT + CD_SUFFIX := x11 + endif INCLUDES = . sim drv freetype2 x11 endif diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak index eee24f0..a94fae0 100644 --- a/src/cdluacontextplus5.mak +++ b/src/cdluacontextplus5.mak @@ -10,12 +10,16 @@ DEF_FILE = cdluacontextplus5.def ifneq ($(findstring Win, $(TEC_SYSNAME)), ) CHECK_GDIPLUS = Yes + LIBS = cdcontextplus else - CHECK_XRENDER = Yes + ifdef GTK_DEFAULT + CHECK_GTK = Yes + else + CHECK_XRENDER = Yes + LIBS = cdcontextplus + endif endif -LIBS = cdcontextplus - ifdef USE_LUA52 LIBNAME := $(LIBNAME)52 else -- cgit v1.2.3