summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2010-06-25 04:49:54 +0000
committerscuri <scuri>2010-06-25 04:49:54 +0000
commitc7d2f1f2178be7a4fdbbd49761dff12181d6db78 (patch)
tree2e96caafbccc65b1fe89a0b01999eced00276e74
parentb880f13768528657cb392f6894bf626f16590e64 (diff)
*** empty log message ***
-rw-r--r--src/cairo/cdcairoprn_win32.c4
-rw-r--r--src/cd.def3
-rw-r--r--src/cdcontextplus.mak1
-rw-r--r--src/cdluacontextplus5.mak5
4 files changed, 10 insertions, 3 deletions
diff --git a/src/cairo/cdcairoprn_win32.c b/src/cairo/cdcairoprn_win32.c
index 9869d03..cbf4d66 100644
--- a/src/cairo/cdcairoprn_win32.c
+++ b/src/cairo/cdcairoprn_win32.c
@@ -16,6 +16,10 @@
#include "cairo-win32.h"
+#ifndef DC_COLORDEVICE
+#define DC_COLORDEVICE 32 /* declared only if WINVER 0x0500 */
+#endif
+
static void cdkillcanvas(cdCtxCanvas *ctxcanvas)
{
cairo_surface_t* surface = cairo_get_target(ctxcanvas->cr);
diff --git a/src/cd.def b/src/cd.def
index 5ea8ea2..c8a419d 100644
--- a/src/cd.def
+++ b/src/cd.def
@@ -395,6 +395,7 @@ EXPORTS
cdCanvasTransformPoint
cdfCanvasTransformPoint
cdRound
-
+ cdStrDup
+
cdInitContextPlusList
cdGetContextPlus
diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak
index 69aca36..9a49404 100644
--- a/src/cdcontextplus.mak
+++ b/src/cdcontextplus.mak
@@ -11,6 +11,7 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), )
INCLUDES = . gdiplus drv
LIBS = gdiplus
+ CHECK_GDIPLUS = Yes
else
SRC = xrender/cdxrender.c xrender/cdxrplus.c
diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak
index 16b7876..fb9fa11 100644
--- a/src/cdluacontextplus5.mak
+++ b/src/cdluacontextplus5.mak
@@ -8,8 +8,9 @@ SRCDIR = lua5
SRC = cdluacontextplus5.c
DEF_FILE = cdluacontextplus5.def
-ifeq ($(findstring Win, $(TEC_SYSNAME)), )
- # Check for XRender availability if NOT Windows
+ifneq ($(findstring Win, $(TEC_SYSNAME)), )
+ CHECK_GDIPLUS = Yes
+else
CHECK_XRENDER = Yes
endif