From 6620df9471268a72f0c58eddb99c0d612bca566e Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 13 Oct 2010 22:29:55 +0000 Subject: *** empty log message *** --- html/en/drv/cairo.html | 3 ++- html/en/guide.html | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'html/en') diff --git a/html/en/drv/cairo.html b/html/en/drv/cairo.html index eea6f75..0b28ea5 100644 --- a/html/en/drv/cairo.html +++ b/html/en/drv/cairo.html @@ -62,7 +62,8 @@ for complex clipping regions.

GDK base driver.

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.

Extra Drivers (cdcairo.h)

diff --git a/html/en/guide.html b/html/en/guide.html index 4332adb..93cd1df 100644 --- a/html/en/guide.html +++ b/html/en/guide.html @@ -96,20 +96,22 @@ the makefiles and projects expect the following directory tree:

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. -- cgit v1.2.3