summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2010-10-13 22:29:55 +0000
committerscuri <scuri>2010-10-13 22:29:55 +0000
commit6620df9471268a72f0c58eddb99c0d612bca566e (patch)
treec932b63ddb2d8295b136c7ace7e8e2e6bad4fe41
parenteef7ae01a9757f5e4a0693d539ee1fac5b09e756 (diff)
*** empty log message ***
-rw-r--r--html/en/drv/cairo.html3
-rw-r--r--html/en/guide.html14
-rw-r--r--src/cdcairo.mak4
-rw-r--r--src/cdcontextplus.mak4
-rw-r--r--src/cdluacontextplus5.mak10
5 files changed, 25 insertions, 10 deletions
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.</p>
GDK base driver.</p>
<p>As an alternative you can use <strong>require</strong>&quot;<strong>cdluacairo&quot;</strong>,
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.</p>
<h3>Extra Drivers (cdcairo.h)</h3>
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:</p>
<pre>cd -&gt; <strong><span class="style2">FreeType</span></strong> (included as separate library)
<em> cdwin*</em> -&gt; <strong><span class="style4">gdi32</span></strong> <strong><span class="style4">user32</span></strong> <strong><span class="style4">comdlg32</span></strong> (system - Windows)
<em> cdx11*</em> -&gt; <strong><span class="style4">X11</span></strong> (system - UNIX)
-<em> </em><em>cdgdk</em><em>*</em> -&gt; <strong><span class="style1">gdk-win32-2.0 pangowin32-1.0</span></strong>(system - Windows)
+<em> </em><em>cdgdk+cdcairo*</em> -&gt; <strong><span class="style1">gdk-win32-2.0 pangowin32-1.0</span></strong>(system - Windows)
<em> </em> -&gt; <strong><span class="style1">gdk-x11-2.0</span></strong> <strong><span class="style1">pangox-1.0 </span></strong>(system - UNIX)
- -&gt; <span class="style1"><strong>cairo-2 </strong></span><strong><span class="style1">gdk_pixbuf-2.0 pango-1.0 gobject-2.0</span></strong> <strong><span class="style1">gmodule-2.0 glib-2.0</span></strong> (system - Windows/UNIX)
+ -&gt; <span class="style1"><strong>cairo </strong></span><strong><span class="style1">gdk_pixbuf-2.0 pango-1.0 gobject-2.0</span></strong> <strong><span class="style1">gmodule-2.0 glib-2.0</span></strong> (system - Windows/UNIX)
<em>cdgdiplus*</em> -&gt; cd
-&gt; <strong><span class="style4">gdiplus</span></strong> (system - Windows)
<em>cdxrender*</em> -&gt; cd
-&gt; <strong><span class="style4">Xrender</span></strong> <strong><span class="style4">Xft</span></strong> (system - UNIX)
-<em>cdcairo*</em> -&gt; <span class="style1"><strong>cairo-2</strong></span> (system - Windows/UNIX)
+cdcairo -&gt; <span class="style1"><strong>pangocairo-1.0 cairo</strong></span> (system - Windows/UNIX)
cdpdf -&gt; <strong><span class="style2">pdflib</span></strong> (included as separate library)
<em>cd</em>gl -&gt; <span class="style1">opengl32</span> (system - Windows)
-&gt; <span class="style1">GL</span> (system - UNIX)
-&gt; <strong><span class="style2">ftgl</span></strong> (included as separate library)
cdlua51 -&gt; cd
-&gt; <strong><span class="style3">lua5.1</span></strong>
+cdluacontextplus -&gt; cdlua51
+ -&gt; cdcontextplus
cdluaim51 -&gt; cdlua51
-&gt; <strong><span class="style3">imlua51</span></strong>
cdluapdf51 -&gt; cdlua51
@@ -117,9 +119,9 @@ cdluapdf51 -&gt; cdlua51
cdluagl51 -&gt; cdlua51
-&gt; cdgl
-(*) In Windows, &quot;<strong>cdwin</strong>&quot; is called &quot;<strong>cd</strong>&quot;.
- In Linux and BSD &quot;<strong>cdgdk</strong>&quot; is called &quot;<strong>cd</strong>&quot;.
- In IRIX, AIX and SunOS &quot;<strong>cdx11</strong>&quot; is called &quot;<strong>cd</strong>&quot;.</pre>
+(*) In Windows, &quot;<strong>cdwin</strong>&quot; is called &quot;<strong>cd</strong>&quot;, &quot;<strong>cdgdiplus</strong>&quot; is called &quot;<strong>cdcontextplus</strong>&quot;.
+ In Linux and BSD &quot;<strong>cdgdk+cdcairo</strong>&quot; is called &quot;<strong>cd</strong>&quot;, &quot;<strong>cdxrender</strong>&quot; is called &quot;<strong>cdcontextplus</strong>&quot;.
+ In IRIX, AIX and SunOS &quot;<strong>cdx11</strong>&quot; is called &quot;<strong>cd</strong>&quot;, &quot;<strong>cdxrender</strong>&quot; is called &quot;<strong>cdcontextplus</strong>&quot;.</pre>
<p>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