From 3e43f28ac126aef08e56c67545d1fbe3f6f96eff Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Wed, 16 Dec 2009 14:12:34 +0000
Subject: *** empty log message ***

---
 include/cd_private.h       |  2 ++
 mak.vc9/cd.vcproj          |  2 +-
 mak.vc9/cdgdk.vcproj       | 16 ++++++++++++++++
 mak.vc9/cdsimplegdk.vcproj |  2 +-
 mak.vc9/cdtestgdk.vcproj   |  4 ++--
 src/cd.def                 |  1 +
 src/gdk/cdgdk.c            |  5 +++++
 src/win32/cdwin.c          |  6 ++++++
 src/x11/cdx11.c            |  5 +++++
 9 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/include/cd_private.h b/include/cd_private.h
index c45359f..af216c5 100644
--- a/include/cd_private.h
+++ b/include/cd_private.h
@@ -233,6 +233,8 @@ struct _cdCanvas
   cdContext* context;
 };
 
+enum{CD_BASE_WIN, CD_BASE_X, CD_BASE_GDK};
+int cdBaseDriver(void);
 
 /***************/
 /* attributes  */
diff --git a/mak.vc9/cd.vcproj b/mak.vc9/cd.vcproj
index b0a5786..438fa4d 100644
--- a/mak.vc9/cd.vcproj
+++ b/mak.vc9/cd.vcproj
@@ -68,7 +68,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="cdcore.lib"
-				OutputFile="$(OutDir)/$(ProjectName).lib"
+				OutputFile="$(OutDir)/cd.lib"
 				AdditionalLibraryDirectories="$(OutDir)"
 				SuppressStartupBanner="true"
 			/>
diff --git a/mak.vc9/cdgdk.vcproj b/mak.vc9/cdgdk.vcproj
index 9911bad..d6d4636 100644
--- a/mak.vc9/cdgdk.vcproj
+++ b/mak.vc9/cdgdk.vcproj
@@ -99,6 +99,22 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="null"
+			>
+			<File
+				RelativePath="..\src\drv\cd0emf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cd0prn.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cd0wmf.c"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\src\gdk\cdgdk.c"
 			>
diff --git a/mak.vc9/cdsimplegdk.vcproj b/mak.vc9/cdsimplegdk.vcproj
index fda6eb2..57fe233 100644
--- a/mak.vc9/cdsimplegdk.vcproj
+++ b/mak.vc9/cdsimplegdk.vcproj
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib cd.lib iupcd.lib iupgtk.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib"
+				AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib cdgdk.lib iupcd.lib iupgtk.lib comctl32.lib cdpdf.lib pdflib.lib iupcontrols.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/mak.vc9/cdtestgdk.vcproj b/mak.vc9/cdtestgdk.vcproj
index e9bd027..e145ade 100644
--- a/mak.vc9/cdtestgdk.vcproj
+++ b/mak.vc9/cdtestgdk.vcproj
@@ -72,11 +72,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="freetype6.lib comctl32.lib cd.lib iupcd.lib cdcontextplus.lib iup.lib gdiplus.lib cdpdf.lib pdflib.lib"
+				AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib comctl32.lib cdgdk.lib iupcd.lib iupgtk.lib cdpdf.lib pdflib.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib,..\..\iup\lib"
+				AdditionalLibraryDirectories="..\lib,..\..\iup\lib;d:\lng\gtk\lib"
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
diff --git a/src/cd.def b/src/cd.def
index 754ed69..c087d9d 100644
--- a/src/cd.def
+++ b/src/cd.def
@@ -24,6 +24,7 @@ EXPORTS
   cdGetScreenColorPlanes
   cdGetScreenSize
   cdUseContextPlus
+  cdBaseDriver
   
   cdinittableMF
   cdkillcanvasMF
diff --git a/src/gdk/cdgdk.c b/src/gdk/cdgdk.c
index 5a84c6e..e2bc5c0 100644
--- a/src/gdk/cdgdk.c
+++ b/src/gdk/cdgdk.c
@@ -2562,3 +2562,8 @@ void cdgdkInitTable(cdCanvas* canvas)
   if (canvas->bpp > 8)
     canvas->cxPutImageRectRGBA = cdputimagerectrgba;
 }
+
+int cdBaseDriver(void)
+{
+  return CD_BASE_GDK;
+}
diff --git a/src/win32/cdwin.c b/src/win32/cdwin.c
index 57c07b9..3b04497 100644
--- a/src/win32/cdwin.c
+++ b/src/win32/cdwin.c
@@ -2364,3 +2364,9 @@ void cdwInitTable(cdCanvas* canvas)
   if (ctxcanvas->wtype == CDW_EMF)
     canvas->cxPutImageRectRGBA = cdputimagerectrgba; 
 }
+
+int cdBaseDriver(void)
+{
+  return CD_BASE_WIN;
+}
+
diff --git a/src/x11/cdx11.c b/src/x11/cdx11.c
index 88bd184..94aae39 100644
--- a/src/x11/cdx11.c
+++ b/src/x11/cdx11.c
@@ -2448,3 +2448,8 @@ void cdxInitTable(cdCanvas* canvas)
   if (canvas->bpp > 8)
     canvas->cxPutImageRectRGBA = cdputimagerectrgba;
 }
+
+int cdBaseDriver(void)
+{
+  return CD_BASE_X;
+}
-- 
cgit v1.2.3