4 files changed, 50 insertions, 4 deletions
diff --git a/src/cairo/cdcairo.def b/src/cairo/cdcairo.def
new file mode 100644
index 0000000..874e2af
--- /dev/null
+++ b/src/cairo/cdcairo.def
@@ -0,0 +1,10 @@
+EXPORTS
+  cdContextCairoImage
+  cdContextCairoImageRGB
+  cdContextCairoPS
+  cdContextCairoPrinter
+  cdContextCairoNativeWindow
+  cdContextCairoDBuffer
+  cdContextCairoSVG
+  cdContextCairoPDF
+  cdInitContextPlus
diff --git a/src/cdcairo.mak b/src/cdcairo.mak
new file mode 100644
index 0000000..f38f14d
--- /dev/null
+++ b/src/cdcairo.mak
@@ -0,0 +1,23 @@
+PROJNAME = cd
+LIBNAME = cdcairo
+OPT = YES
+
+DEFINES = CD_NO_OLD_INTERFACE
+
+USE_CAIRO = Yes
+
+INCLUDES = . cairo drv
+SRCDIR = cairo
+SRC = cdcairodbuf.c cdcairopdf.c cdcairosvg.c cdcairo.c cdcairoimg.c cdcairoplus.c cdcairoirgb.c cdcairops.c
+
+# Unused here, goes inside cdgdk
+# cdcaironative_gdk.c  
+
+ifneq ($(findstring Win, $(TEC_SYSNAME)), )
+  SRC += cdcaironative_win32.c
+else
+  SRC += cdcaironative_x11.c    
+endif
+
+USE_CD = YES
+CD = ..
diff --git a/src/cdgdk.def b/src/cdgdk.def
index 49595a6..301772b 100644
--- a/src/cdgdk.def
+++ b/src/cdgdk.def
@@ -17,6 +17,16 @@ EXPORTS
   cdContextDebug
   cdContextSVG
 
+  cdContextCairoImage
+  cdContextCairoImageRGB
+  cdContextCairoPS
+  cdContextCairoPrinter
+  cdContextCairoNativeWindow
+  cdContextCairoDBuffer
+  cdContextCairoSVG
+  cdContextCairoPDF
+  cdInitContextPlus
+  
   cdRedImage
   cdGreenImage
   cdBlueImage
diff --git a/src/config.mak b/src/config.mak
index e9ba19a..2dfea4a 100644
--- a/src/config.mak
+++ b/src/config.mak
@@ -5,7 +5,7 @@ OPT = YES
 DEFINES = CD_NO_OLD_INTERFACE
 
 SRCSVG = base64.c lodepng.c cdsvg.c
-SRCSVG  := $(addprefix svg/, $(SRCSVG))
+SRCSVG := $(addprefix svg/, $(SRCSVG))
 
 SRCINTCGM = circle.c ellipse.c intcgm1.c \
   intcgm2.c intcgm4.c intcgm6.c list.c \
@@ -24,6 +24,9 @@ SRCX11  := $(addprefix x11/, $(SRCX11))
 SRCGDK = cdgdk.c cdgdkclp.c cdgdkdbuf.c cdgdkimg.c cdgdknative.c
 SRCGDK  := $(addprefix gdk/, $(SRCGDK))
 
+SRCCAIRO = cdcairodbuf.c cdcairopdf.c cdcairosvg.c cdcairo.c cdcairoimg.c cdcairoplus.c cdcairoirgb.c cdcairops.c cdcaironative_gdk.c
+SRCCAIRO := $(addprefix cairo/, $(SRCCAIRO))
+
 SRCDRV = cddgn.c cdcgm.c cgm.c cddxf.c cdirgb.c cdmf.c cdps.c cdpicture.c cddebug.c
 SRCDRV  := $(addprefix drv/, $(SRCDRV))
 
@@ -37,7 +40,7 @@ SRC = $(SRCCOMM) $(SRCSVG) $(SRCINTCGM) $(SRCDRV) $(SRCSIM)
 
 ifneq ($(findstring Win, $(TEC_SYSNAME)), )
   ifdef USE_GDK
-    SRC += $(SRCGDK) $(SRCNULL)
+    SRC += $(SRCGDK) $(SRCNULL) $(SRCCAIRO)
     LIBNAME := cdgdk
     USE_GTK = Yes
   else
@@ -46,7 +49,7 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), )
   LIBS = freetype6
 else
   ifdef USE_GDK
-    SRC += $(SRCGDK)
+    SRC += $(SRCGDK) $(SRCCAIRO)
     LIBNAME := cdgdk
     USE_GTK = Yes
   else
@@ -63,4 +66,4 @@ endif
 
 LDIR = ../lib/$(TEC_UNAME)
 
-INCLUDES = . drv x11 win32 intcgm freetype2 sim ../include
+INCLUDES = . drv x11 win32 intcgm freetype2 sim cairo ../include