+ Cairo branch merged after successful testing on Mac OS X 10.5.4, Linux Ubuntu 8.04,Windows XPSP2.

  This integration is minimum as discussed, in particular it does not feature any fltk cairo drawing substitution
  as in fltk2.
  Still it provides all the fundations to go further even in next 1.4 ... 
  By default *no* cairo features are implemented nor linked, it can only be activated by --enable-cairo
  whose default is false.
  Please visit the README.cairo for complete description.

+ fixed UTF8 compilation pb on linux ubuntu

+ minor comments fixes on the fly



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

97 files changed, 23765 insertions, 135 deletions

diff --git a/FL/Fl.H b/FL/Fl.H
index df1b9d861..88d963d5c 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -25,14 +25,17 @@
 //     http://www.fltk.org/str.php
 //
 
-/** \file
-  
- * Fl static class .
+/** \file  
+    Fl static class .
  */
 
 #ifndef Fl_H
 #  define Fl_H
 
+#ifdef HAVE_CAIRO
+# include <FL/Fl_Cairo.H>
+#endif
+
 #  include "fl_utf8.h"
 #  include "Enumerations.H"
 #  ifndef Fl_Object
@@ -43,6 +46,7 @@
 #    undef check
 #  endif
 
+
 class Fl_Widget;
 class Fl_Window;
 class Fl_Image;
@@ -800,6 +804,53 @@ public:
   static void clear_widget_pointer(Fl_Widget const *w);
   /** @} */
 
+#ifdef HAVE_CAIRO
+  /** \defgroup group_cairo Cairo functions support 
+      @{ 
+  */
+public:
+  // Cairo support API
+  static cairo_t * cairo_make_current(Fl_Window* w);
+   /** when HAVE_CAIRO is defined and cairo_autolink_context() is true, 
+       any current window dc is linked to a current context.
+      this is not the default because, it may not be necessary
+      to add cairo support to all fltk supported windows.
+      When you wish to associate a cairo context in this mode,
+      you need to call explicitly in your draw() overriden method,
+      FL::cairo_make_current(Fl_Window*). This will create a cairo context
+      but only for this Window. 
+      Still in custom cairo application it is possible to handle 
+      completely this process automatically by setting \a alink to true.
+      In this last case, you don't need anymore to call Fl::cairo_make_current()
+      you can use Fl::cairo_cc() to get the current cairo context anytime.
+     \note Only available when configure has the --enable-cairo option
+  */
+  static void cairo_autolink_context(bool alink) {cairo_state_.autolink(alink);}
+  /** 
+    Gets the current autolink mode for cairo support, 
+    \retval false if no cairo context autolink is made for each window. 
+    \retval true if any fltk window is attached a cairo context when it 
+    is current. \see void cairo_autolink_context(bool alink) 
+    \note Only available when configure has the --enable-cairo option
+ */
+  static bool cairo_autolink_context() {return cairo_state_.autolink();}
+  /** Gets the current cairo context linked with a fltk window. */
+  static cairo_t * cairo_cc() { return cairo_state_.cc(); }
+  /** Sets the cairo current context to \a c, 
+      set \a own to true if you want fltk to handle this cc deletion.
+     \note Only available when configure has the --enable-cairo option
+*/
+  static void cairo_cc(cairo_t * c, bool own=false){ cairo_state_.cc(c, own); } 
+
+private:
+  static cairo_t * cairo_make_current(void* gc);
+  static cairo_t * cairo_make_current(void* gc, int W, int H);
+  static Fl_Cairo_State cairo_state_;
+public:
+  /** @} */ 
+
+#endif // HAVE_CAIRO
+
 };
 
 #endif // !Fl_H
diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H
new file mode 100644
index 000000000..15cd14831
--- /dev/null
+++ b/FL/Fl_Cairo.H
@@ -0,0 +1,98 @@
+//
+// "$Id$"
+//
+// Main header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2008 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/** \file
+    Hanling transparently platform dependent cairo include files 
+*/
+
+#ifndef FL_CAIRO_H
+# define FL_CAIRO_H
+# ifdef HAVE_CAIRO
+
+// Cairo is currently supported for the following platforms:
+// Win32, Apple Quartz, X11
+
+# include <FL/Fl_Export.H>
+
+# if defined(USE_X11) // X11
+#  include <cairo-xlib.h>
+# elif defined(WIN32)
+#  include <cairo-win32.h>
+# elif defined(__APPLE_QUARTZ__)
+#  include <cairo-quartz.h>
+# elif defined(__APPLE_QD__)
+#  error Apple Quartz is necessary for Cairo upport.
+# else
+#  error Cairo is not supported on that platform.
+# endif
+
+/** 
+   \addtogroup group_cairo
+   @{
+*/
+
+/** 
+   Contains all the necessary info on the current cairo context.
+   A private internal & unique corresponding object is created to
+   permit cairo context state handling while keeping it opaque.
+   For internal use only.
+   \note Only available when configure has the --enable-cairo option
+*/
+class FL_EXPORT Fl_Cairo_State {
+public:
+  Fl_Cairo_State() : cc_(0), own_cc_(false), autolink_(false), window_(0), gc_(0) {}
+
+    // access attributes
+    cairo_t* cc() const {return cc_;}		 ///< Gets the current cairo context
+    bool autolink() const {return autolink_;}	 ///< Sets the autolink option \see Fl:cairo_autolink_context(bool)
+    void cc(cairo_t* c, bool own=true)  {	 ///< Sets the current cairo context, \a own indicates cc deletion is made by us
+	if (cc_ && own_cc_) cairo_destroy(cc_); 
+	cc_=c;
+	if (!cc_) window_=0;
+	own_cc_=own;
+    }
+    void  autolink(bool b)  {autolink_ = b;}	///< Gets the autolink option
+    void  window(void* w)  {window_=w;}		///< Sets the window \w to keep track on
+    void* window() const {return window_;}	///< Gets the last window attached to a cc
+    void  gc(void* c)  {gc_=c;}		        ///< Sets the gc \c to keep track on
+    void* gc() const {return gc_;}		///< Gets the last gc attached to a cc
+
+private:
+    cairo_t * cc_;	 // contains the unique autoupdated cairo context
+    bool own_cc_;	 // indicates whether we must delete the cc, useful for internal cleanup
+    bool autolink_;	 // true by default, permits to prevent the automatic cairo mapping on fltk windows for custom cairo implementations
+    void* window_, *gc_; // for keeping track internally of last win+gc treated
+};
+
+/** @} */
+
+# endif // HAVE_CAIRO
+#endif // FL_CAIRO_H
+
+//
+// End of "$Id$" .
+//
diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H
new file mode 100644
index 000000000..3914657a9
--- /dev/null
+++ b/FL/Fl_Cairo_Window.H
@@ -0,0 +1,87 @@
+//
+// "$Id$"
+//
+// Main header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2008 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/** \file
+    Fl_Cairo_Window Hanling transparently a fltk window incorporte a cairo draw callback.
+*/
+
+#ifndef FL_CAIRO_WINDOW_H
+# define FL_CAIRO_WINDOW_H
+# ifdef HAVE_CAIRO
+
+// Cairo is currently supported for the following platforms:
+// Win32, Apple Quartz, X11
+#  include <FL/Fl.H>
+#  include <FL/Fl_Double_Window.H>
+
+/** 
+   \addtogroup group_cairo
+   @{
+*/
+
+/**
+   This defines a pre-configured cairo fltk window.
+   This class overloads for you the virtual draw() method,
+   so that the only thing you have to do is to provide your cairo code.
+   All cairo context handling is achieved transparently.
+   \note You can alternatively define your custom cairo fltk window,
+   and thus at least override the draw() method to provide custom cairo
+   support. In this case you will probably use Fl:cairo_make_current(Fl_Window*)
+   to attach a context to your window. You should do it on ly when your Window is 
+   the current window. \see Fl_Window::current()
+*/
+class FL_EXPORT Fl_Cairo_Window : public Fl_Double_Window {
+public:
+    Fl_Cairo_Window(int w, int h) : Fl_Double_Window(w,h),draw_cb_(0) {}
+    /** Overloaded to provide cairo callback support */
+    void draw() {
+      Fl_Double_Window::draw();
+      // manual method ? if yes explicitly get a cairo_context here
+      if (!Fl::cairo_autolink_context()) 
+	Fl::cairo_make_current(this); 
+      if (draw_cb_) draw_cb_(this, Fl::cairo_cc());
+    }
+    /** This defines the cairo draw calback prototype that you must further */
+    typedef void (*cairo_draw_cb) (Fl_Cairo_Window* self, cairo_t* def);
+    /** 
+	You must provide a draw callback which will implement your cairo rendering,
+	This method will permit you to set you \a cb cairo callback.
+    */
+    void set_draw_cb(cairo_draw_cb  cb){draw_cb_=cb;}
+private:
+    cairo_draw_cb draw_cb_;
+};
+
+
+/** @} */
+
+# endif // HAVE_CAIRO
+#endif // FL_CAIRO_WINDOW_H
+
+//
+// End of "$Id$" .
+//
diff --git a/FL/win32.H b/FL/win32.H
index e58dbfb39..b03c6ef44 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -125,12 +125,12 @@ typedef HBITMAP Fl_Offscreen;
 
 extern FL_EXPORT HDC fl_makeDC(HBITMAP);
 
-#define fl_begin_offscreen(b) \
-  HDC _sgc=fl_gc; Window _sw=fl_window; \
-  fl_gc=fl_makeDC(b); int _savedc = SaveDC(fl_gc); fl_window=(HWND)b; fl_push_no_clip()
+# define fl_begin_offscreen(b) \
+   HDC _sgc=fl_gc; Window _sw=fl_window; \
+   fl_gc=fl_makeDC(b); int _savedc = SaveDC(fl_gc); fl_window=(HWND)b; fl_push_no_clip()
 
-#define fl_end_offscreen() \
-  fl_pop_clip(); RestoreDC(fl_gc, _savedc); DeleteDC(fl_gc); fl_window=_sw; fl_gc = _sgc
+# define fl_end_offscreen() \
+   fl_pop_clip(); RestoreDC(fl_gc, _savedc); DeleteDC(fl_gc); fl_window=_sw; fl_gc = _sgc
 
 FL_EXPORT void fl_copy_offscreen(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy);
 FL_EXPORT void fl_copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy);
diff --git a/README.cairo b/README.cairo
new file mode 100644
index 000000000..fa5260c8d
--- /dev/null
+++ b/README.cairo
@@ -0,0 +1,74 @@
+Cairo Support for fltk 1.3
+===========================
+
+It is now possible to integrate cairo rendering in your fltk application
+more easily and transparently.
+In 1.3, we provide minimum support for Cairo,
+In particular, no "total" cairo rendering layer support is achieved,
+as in fltk2.
+
+Configuration:
+-------------
+All the changes are *inactive*  as long as the new configuration
+option --enable-cairo is not added to the configure command.
+For non configure based platforms/ide, the HAVE_CAIRO preprocess var.
+has to be defined.
+All configure based build files has now this feature integrated,
+also vc2005 build files have 2 new build modes "Release Cairo" and 
+"Debug Cairo".
+Others IDE's will be updated progressively.
+
+The current support consist in :
+-------------------------------
+- Adding a new Fl_Cairo_Window class permitting transparent and easy
+integration of a Cairo draw callback without the need to achieve subclassing.
+
+- Adding a Fl::cairo_make_current(Fl_Window*) function only providing
+transparently a cairo context to your custom Fl_Window derived class.
+This function is intended to be used in your overloaded draw() method.
+
+- Adding an optional cairo autolink context mode support (disabled by default)
+  which permits complete & automatic synchronization of OS dependent graphical 
+  context and cairo contexts, thus furthering a valid cairo context anytime, 
+  in any current window. 
+  This feature should be only necessary in the following cases:
+  -  Intensive and almost systematic use of cairo contexts in an fltk application
+  -  Creation of a new cairo based scheme for fltk ...
+  -  Other uses of cairo necessiting the flk internals instrumentation 
+     to automatically making possible the use of a cairo context 
+     in any fltk window.
+
+- A new cairo demo that is available in the test subdirectory and has been
+   used as a testcase durings the multiplatform tests.
+
+For more details, please have a look to the doxygen documentation,
+in the Modules section.
+
+-----------------------------------------------------------------------
+Reminder for potential future considerations 
+
+From Bill:
+First there is the HAVE_CAIRO configuration option. This indicates that
+any cairo calls are available. In this case you get something like this:
+
+// static variable holding the last cairo context fltk set:
+cairo_t* Fl::cr;
+
+// Make cr draw in this window. This hides the ugly platform-dependent
+// part of getting cairo going:
+void Fl::cairo_make_current(Fl_Window*)
+
+*** POST 1.3 potential cairo use:
+// Set cr to something you made yourself. This lets you reuse functions
+// that use cr, and also tells fltk that cr is not one of it's own and
+// thus cannot be destroyed or reused for a different window:
+void Fl::cairo_make_current(cairo_t*)
+
+Second there is the USE_CAIRO configuration option. This means that all
+drawing is done using Cairo. In this case when a widget draw() method is
+called, it is exactly as though cairo_make_current(window) has been done.
+*** 
+
+Note that it should be possible to compile so HAVE_CAIRO works even if
+USE_CAIRO does not, and so that turning on USE_CAIRO does not break any
+programs written for HAVE_CAIRO.
diff --git a/TODO.cairo b/TODO.cairo
deleted file mode 100644
index 0f3505155..000000000
--- a/TODO.cairo
+++ /dev/null
@@ -1,35 +0,0 @@
-Reminder for present and potential future considerations 
-
-From Bill:
-First there is the HAVE_CAIRO configuration option. This indicates that
-any cairo calls are available. In this case you get something like this:
-
-// static variable holding the last cairo context fltk set:
-cairo_t* Fl::cr;
-
-// Make cr draw in this window. This hides the ugly platform-dependent
-// part of getting cairo going:
-void Fl::cairo_make_current(Fl_Window*)
-
-*** POST 1.3 potential cairo use:
-// Set cr to something you made yourself. This lets you reuse functions
-// that use cr, and also tells fltk that cr is not one of it's own and
-// thus cannot be destroyed or reused for a different window:
-void Fl::cairo_make_current(cairo_t*)
-
-Second there is the USE_CAIRO configuration option. This means that all
-drawing is done using Cairo. In this case when a widget draw() method is
-called, it is exactly as though cairo_make_current(window) has been done.
-*** 
-
-Note that it should be possible to compile so HAVE_CAIRO works even if
-USE_CAIRO does not, and so that turning on USE_CAIRO does not break any
-programs written for HAVE_CAIRO.
-
-From Fabien
-We will provide some service for users to use cairo with fltk 1.3 :
-A HAVE_CAIRO configuration option will be created.
-A simple Fl_Cairo_Window will be implemented and will provide basic 
-cairo surface transparent handling (hiding non portable cairo context creation and so on).
-A demo program called cairo_test will be added in demo,  providing a new test case.
-This program will raise an alert dialog box in case HAVE_CAIRO is not set, indicating that cairo lib is not available.
diff --git a/configh.in b/configh.in
index 4e73833dc..d99e95aa8 100644
--- a/configh.in
+++ b/configh.in
@@ -130,6 +130,16 @@
 #undef __APPLE_QUARTZ__
 #undef __APPLE_QD__
 
+
+/*
+ * USE_X11
+ *
+ * Should we use X11 for the current platform
+ *
+ */
+
+#undef USE_X11
+
 /*
  * HAVE_OVERLAY:
  *
@@ -237,6 +247,14 @@
 #undef HAVE_LIBJPEG
 
 /*
+ * HAVE_CAIRO
+ *
+ * Do we have the cairo library available?
+ */
+
+#undef HAVE_CAIRO
+
+/*
  * Which header file do we include for libpng?
  */
 
diff --git a/configure.in b/configure.in
index a73c40002..f842ad521 100644
--- a/configure.in
+++ b/configure.in
@@ -530,7 +530,7 @@ AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, defaul
     [if test x$enable_localpng = xyes; then
 	ac_cv_lib_png_png_set_tRNS_to_alpha=no
     fi])
-
+ 
 AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
     PNGINC=""
     PNG=""
@@ -561,6 +561,17 @@ LIBS="$SAVELIBS"
 dnl See if we need a .exe extension on executables...
 AC_EXEEXT
 
+dnl Check for Cairo library unless disabled...
+AC_ARG_ENABLE(cairo,[  --enable-cairo          use Cairo graphics (default=no)])
+if test x$enable_cairo = xyes; then
+	  AC_DEFINE(HAVE_CAIRO)
+	  dnl FIXME This part should be fixed so configure do not depend on
+	  dnl we do not rely on pkg-config .
+          CXXFLAGS="`pkg-config --cflags cairo` $CXXFLAGS"
+          CAIROLIBS="-lcairo -lpixman-1" 
+	  LIBS="-lcairo -lpixman-1 $LIBS"
+fi
+
 dnl Check for pthreads for multi-threaded apps...
 have_pthread=no
 PTHREAD_FLAGS=""
@@ -703,12 +714,12 @@ case $uname in
 	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
 	fi
 
-	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
+	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 	LDFLAGS="$X_LIBS $LDFLAGS"
 	DSOFLAGS="$X_LIBS $DSOFLAGS"
-
+	AC_DEFINE(USE_X11)
 	if test "x$x_includes" != x; then
 	    ac_cpp="$ac_cpp -I$x_includes"
 	fi
@@ -781,6 +792,8 @@ case $uname in
 	if test x$enable_xdbe != xno; then
 	    AC_CHECK_HEADER(X11/extensions/Xdbe.h, AC_DEFINE(HAVE_XDBE),,
 	        [#include <X11/Xlib.h>])
+	    AC_CHECK_LIB(Xext, XdbeQueryExtension, 
+		LIBS="-lXext $LIBS")
 	fi
 
 	dnl Check for overlay visuals...
@@ -1124,6 +1137,10 @@ if test x$ZLIB = x; then
 else
     echo "                 ZLIB=Builtin"
 fi
+if test x$enable_cairo = xyes; then
+    echo "                 CAIRO=System"
+fi
+
 
 if test x$enable_largefile != xno; then
     echo "    Large Files: YES"
diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index b6fadb7b5..7972d709b 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -548,7 +548,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                =  ../src/fl_font_win32.cxx ../src/fl_font_mac.cxx \
+EXCLUDE                =  ../src/fl_font_win32.cxx ../src/fl_font_mac.cxx
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -1127,6 +1127,7 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = FL_DOXYGEN \
+		         HAVE_CAIRO \
 		       	 HAVE_GL \
 			 HAVE_GL_OVERLAY \
                          FL_EXPORT:=
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 667380c2a..a77a653c0 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -30,7 +30,7 @@
 //          mostly to get around the single active context in QD and 
 //          to implement clipping. This should be changed into pure
 //          Quartz calls in the near future.
-
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/x.H>
@@ -1184,6 +1184,9 @@ void Fl_Window::hide() {
       fl_release_dc(fl_window, fl_gc);
       fl_window = (HWND)-1;
       fl_gc = 0;
+# ifdef HAVE_CAIRO
+      if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
+# endif
     }
 #elif defined(__APPLE_QD__)
   if ( ip->xid == fl_window && !parent() )
diff --git a/src/Fl_Cairo.cxx b/src/Fl_Cairo.cxx
new file mode 100644
index 000000000..6a87d3c8c
--- /dev/null
+++ b/src/Fl_Cairo.cxx
@@ -0,0 +1,151 @@
+//
+// "$Id$"
+//
+// Main header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2008 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <config.h>
+
+#ifdef HAVE_CAIRO
+#include <FL/Fl.H>
+#include <FL/x.H>
+#include <FL/Fl_Window.H>
+
+// static Fl module initialization :
+Fl_Cairo_State Fl::cairo_state_;	///< contains all necesary info for current cairo context mapping
+// Fl cairo features implementation
+
+/** 
+    Provides a corresponding cairo context for Window \a w.
+    This is needed in a draw() override if Fl::cairo_autolink_context() 
+    returns false, which is the default.
+    The cairo_context() does not need to be freed as it is freed every time 
+    a new cairo context is created. When the program terminates,
+    a call to Fl::cairo_make_current(0) will destroy any residual context.
+    \note A new cairo context is not always re-created when this method
+    is used. In particular, if the current graphical context and the current 
+    window didn't change between two calls, the previous gc is internally kept,
+    thus optimizing the drawing performances.
+    Also, after this call, Fl::cairo_gc() is adequately updated with this 
+    cairo  context.
+    \note Only available when configure has the --enable-cairo option
+    \return the valid cairo_t* cairo context associated to this window.
+*/
+cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
+    if (!wi) return NULL; // Precondition
+    
+    if (fl_gc==0) { // means remove current cc
+	Fl::cairo_cc(0); // destroy any previous cc
+	cairo_state_.window(0);
+	return 0;
+    }
+
+    // don't re-create a context if it's the same gc/window couple
+    if (fl_gc==Fl::cairo_state_.gc() && fl_xid(wi) == (Window) Fl::cairo_state_.window())
+	return Fl::cairo_cc();
+
+    cairo_state_.window(wi);
+
+#if defined(USE_X11)
+    return Fl::cairo_make_current(0, wi->w(), wi->h());
+#else
+    return Fl::cairo_make_current(fl_gc, wi->w(), wi->h());
+#endif
+}
+
+/* 
+    Creates transparently a cairo_surface_t object.
+    gc is an HDC context in  WIN32, a CGContext* in Quartz, a display on X11
+ */
+static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
+# if defined(USE_X11) // X11
+    return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H);
+# elif   defined(WIN32)
+    return cairo_win32_surface_create((HDC) gc);
+# elif defined(__APPLE_QUARTZ__)
+    return cairo_quartz_surface_create_for_cg_context((CGContext*) gc, W, H);
+# elif defined(__APPLE_QD__)
+#  error Cairo is not supported under Apple Quickdraw, please use Apple Quartz.
+# else
+#  error Cairo is not supported under this platform.
+# endif
+}
+
+/** 
+  Creates a cairo context from a \a gc only, get its window size  or offscreen size if fl_window is null 
+   \note Only available when configure has the --enable-cairo option
+*/
+cairo_t * Fl::cairo_make_current(void *gc) {
+    int W=0,H=0;
+#if defined(USE_X11)
+    //FIXME X11 get W,H
+    // gc will be the window handle here
+# warning FIXME get W,H for cairo_make_current(void*)
+#elif defined(__APPLE_QUARTZ__) 
+    if (fl_window) {
+      Rect portRect; 
+      GetPortBounds(GetWindowPort( fl_window ), &portRect);
+      W = portRect.right-portRect.left;
+      H = portRect.bottom-portRect.top;
+    } 
+    else {
+      W = CGBitmapContextGetHeight(fl_gc);
+      H = CGBitmapContextGetHeight(fl_gc);
+    }
+#elif defined(WIN32)
+    // we don't need any W,H for WIN32
+#else
+# error Cairo is not supported under this platform.
+#endif
+    if (!gc) {
+	Fl::cairo_cc(0);
+	cairo_state_.gc(0); // keep track for next time
+	return 0;
+    }
+    if (gc==Fl::cairo_state_.gc() && fl_window== (Window) Fl::cairo_state_.window())
+	return Fl::cairo_cc();
+    cairo_state_.gc(fl_gc); // keep track for next time
+    cairo_surface_t * s = cairo_create_surface(gc, W, H);
+    cairo_t * c = cairo_create(s);
+    cairo_surface_destroy(s);
+    Fl::cairo_cc(c);
+    return c;
+}
+
+/** 
+   Creates a cairo context from a \a gc and its size 
+   \note Only available when configure has the --enable-cairo option
+*/
+cairo_t * Fl::cairo_make_current(void *gc, int W, int H) {
+  cairo_surface_t * s = cairo_create_surface(gc, W, H);
+    cairo_t * c = cairo_create(s);
+    cairo_surface_destroy(s);
+    Fl::cairo_cc(c);
+    return c;
+}
+#endif // HAVE_CAIRO
+
+//
+// End of "$Id$" .
+//
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 6c86284e7..37bdd9e96 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -403,6 +403,9 @@ void Fl_Double_Window::flush(int eraseoverlay) {
     RestoreDC(fl_gc, save);
     DeleteDC(fl_gc);
     fl_gc = _sgc;
+    //# if defined(HAVE_CAIRO)
+    //if Fl::cairo_autolink_context() Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately
+    //# endif
 #elif defined(__APPLE__)
     if ( myi->other_xid ) {
       fl_begin_offscreen( myi->other_xid );
diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx
index 12422cfab..a7f17c7d0 100644
--- a/src/Fl_Menu_Window.cxx
+++ b/src/Fl_Menu_Window.cxx
@@ -67,7 +67,12 @@ void Fl_Menu_Window::flush() {
   if (!fl_overlay_visual || !overlay()) {Fl_Single_Window::flush(); return;}
   Fl_X *myi = Fl_X::i(this);
   fl_window = myi->xid;
-  if (!gc) gc = XCreateGC(fl_display, myi->xid, 0, 0);
+  if (!gc) {
+	  gc = XCreateGC(fl_display, myi->xid, 0, 0);
+# if defined(HAVE_CAIRO)
+      Fl::cairo_make_current(gc); // capture gc changes automatically to update the cairo context adequately
+# endif
+  }
   fl_gc = gc;
   fl_overlay = 1;
   fl_clip_region(myi->region); myi->region = 0; current_ = this;
diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx
index fd4fdfdcc..4e76566c9 100644
--- a/src/Fl_Overlay_Window.cxx
+++ b/src/Fl_Overlay_Window.cxx
@@ -131,8 +131,13 @@ void _Fl_Overlay::show() {
 
 void _Fl_Overlay::flush() {
   fl_window = fl_xid(this);
-  if (!gc) gc = XCreateGC(fl_display, fl_xid(this), 0, 0);
+  if (!gc) {
+	  gc = XCreateGC(fl_display, fl_xid(this), 0, 0);
+  }
   fl_gc = gc;
+#if defined(HAVE_CAIRO)
+      if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately
+#endif
   fl_overlay = 1;
   Fl_Overlay_Window *w = (Fl_Overlay_Window *)parent();
   Fl_X *myi = Fl_X::i(this);
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx
index 817217c8e..e3d07ea67 100644
--- a/src/Fl_Text_Buffer.cxx
+++ b/src/Fl_Text_Buffer.cxx
@@ -64,8 +64,15 @@ static char *expandTabs(const char *text, int startIndent, int tabDist,
                          char nullSubsChar, int *newLen);
 static char *unexpandTabs(char *text, int startIndent, int tabDist,
                            char nullSubsChar, int *newLen);
-static int max(int i1, int i2);
-static int min(int i1, int i2);
+#ifndef min
+static int max(int i1, int i2) {
+  return i1 >= i2 ? i1 : i2;
+}
+
+static int min(int i1, int i2) {
+  return i1 <= i2 ? i1 : i2;
+}
+#endif
 
 static const char *ControlCodeTable[ 32 ] = {
   "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
@@ -2569,14 +2576,6 @@ static char *unexpandTabs(char *text, int startIndent, int tabDist,
   return outStr;
 }
 
-static int max(int i1, int i2) {
-  return i1 >= i2 ? i1 : i2;
-}
-
-static int min(int i1, int i2) {
-  return i1 <= i2 ? i1 : i2;
-}
-
 int
 /**
   Inserts a file at the specified position. Returns 0 on success, 
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 21eec3caa..32459d367 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -29,7 +29,7 @@
 // This is the system-independent portions.  The huge amount of 
 // crap you need to do to communicate with X is in Fl_x.cxx, the
 // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx
-
+#include "config.h"
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <stdlib.h>
@@ -132,6 +132,10 @@ void Fl_Window::draw() {
   set_flag(saveflags);
   y(savey);
   x(savex);
+
+# if defined(HAVE_CAIRO)
+  Fl::cairo_make_current(this); // checkout if an update is necessary
+# endif
 }
 
 void Fl_Window::label(const char *name) {
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index eb3b82393..94473b512 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -2312,10 +2312,18 @@ void Fl_Window::make_current()
   fl_gc = i->gc;
   CGContextSaveGState(fl_gc);
   Fl_X::q_fill_context();
+#if defined(HAVE_CAIRO) && defined (__APPLE_QUARTZ__)
+   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately
+#endif
+
 #endif
   fl_clip_region( 0 );
   SetPortClipRegion( GetWindowPort(i->xid), fl_window_region );
-  return;
+
+#if defined(__APPLE_QUARTZ__) && defined(HAVE_CAIRO)
+  // update the cairo_t context
+  if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
+#endif
 }
 
 // helper function to manage the current CGContext fl_gc
@@ -2363,6 +2371,9 @@ void Fl_X::q_release_context(Fl_X *x) {
       fprintf(stderr, "Error %d in QDEndCGContext\n", (int)err);
   }
   fl_gc = 0;
+#if defined(HAVE_CAIRO) && defined (__APPLE_QUARTZ__)
+  Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
+#endif
 }
 
 void Fl_X::q_begin_image(CGRect &rect, int cx, int cy, int w, int h) {
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index b67bf80dd..e3cf9e83b 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1737,6 +1737,7 @@ HDC fl_GetDC(HWND w) {
   // calling GetDC seems to always reset these: (?)
   SetTextAlign(fl_gc, TA_BASELINE|TA_LEFT);
   SetBkMode(fl_gc, TRANSPARENT);
+
   return fl_gc;
 }
 
@@ -1755,6 +1756,8 @@ void Fl_Window::make_current() {
 
   current_ = this;
   fl_clip_region(0);
+
+
 }
 
 /* Make sure that all allocated fonts are released. This works only if 
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 3fffb0ab5..3300f3741 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1726,6 +1726,12 @@ void Fl_Window::make_current() {
   fl_gc = gc;
   current_ = this;
   fl_clip_region(0);
+
+#ifdef HAVE_CAIRO
+  // update the cairo_t context
+  if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this);
+#endif
+
 }
 
 #endif
diff --git a/src/Makefile b/src/Makefile
index f4ff7f9d4..f7d15b793 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,6 +34,7 @@ CPPFILES = \
 	Fl_Browser_load.cxx \
 	Fl_Box.cxx \
 	Fl_Button.cxx \
+	Fl_Cairo.cxx \
 	Fl_Chart.cxx \
 	Fl_Check_Browser.cxx \
 	Fl_Check_Button.cxx \
diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c
index 205e7d0fc..6e956224d 100644
--- a/src/xutf8/utf8Input.c
+++ b/src/xutf8/utf8Input.c
@@ -40,7 +40,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
+#include <string.h>
 #include <stdlib.h>
 
 #if HAVE_LIBC_ICONV
diff --git a/test/Makefile b/test/Makefile
index 2dc3145ea..7e46b93ba 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,6 +38,7 @@ CPPFILES =\
 	browser.cxx \
 	button.cxx \
 	buttons.cxx \
+	cairo_test.cxx \
 	checkers.cxx \
 	clock.cxx \
 	colbrowser.cxx \
@@ -106,6 +107,7 @@ ALL =	\
 	browser$(EXEEXT) \
 	button$(EXEEXT) \
 	buttons$(EXEEXT) \
+	cairo_test$(EXEEXT) \
 	checkers$(EXEEXT) \
 	clock$(EXEEXT) \
 	colbrowser$(EXEEXT) \
@@ -461,6 +463,7 @@ shape$(EXEEXT): shape.o
 	echo Linking $@...
 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
 
+cairo_test$(EXEEXT): cairo_test.o
 
 #
 # End of "$Id$".
diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx
new file mode 100644
index 000000000..6492d4d40
--- /dev/null
+++ b/test/cairo_test.cxx
@@ -0,0 +1,168 @@
+//
+// "$Id: arc.cxx 5115 2006-05-12 16:00:00Z fabien $"
+//
+// Arc drawing test program for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2006 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to "fltk-bugs@fltk.org".
+//
+
+#include <config.h>
+
+#ifdef HAVE_CAIRO
+
+#include <FL/Fl_Cairo_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/x.H>
+#include <FL/fl_draw.H>
+#include <FL/math.h>
+#define DEF_WIDTH 0.03
+
+// uncomment the following line to enable cairo context autolink feature:
+// #define AUTOLINK
+
+// put your drawing stuff here
+float drawargs[7] = {90, 90, 100, 100, 0, 360, 0};
+const char* name[7] = {"X", "Y", "W", "H", "start", "end", "rotate"};
+
+
+static void centered_text(cairo_t* cr, double x0,double y0,double w0,double h0, const char * my_text) {
+    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_OBLIQUE,CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_source_rgba (cr, 0.9, 0.9, 0.4, 0.6);
+    cairo_text_extents_t extents;
+    cairo_text_extents (cr, my_text, &extents);
+    double x = (extents.width/2 + extents.x_bearing);
+    double y = (extents.height/2 + extents.y_bearing);
+    cairo_move_to  (cr, x0+w0/2-x, y0+h0/2 - y);
+    cairo_text_path(cr,my_text);
+    cairo_fill_preserve (cr);
+    cairo_set_source_rgba (cr, 0, 0, 0,1);
+    cairo_set_line_width (cr, 0.004);
+    cairo_stroke (cr);
+    cairo_set_line_width (cr, DEF_WIDTH);
+
+
+}
+
+static void round_button(cairo_t* cr, double x0, double y0, 
+		  double rect_width, double rect_height, double radius,
+		  double r, double g, double b) {
+    
+    double x1,y1;
+    
+    
+    x1=x0+rect_width;
+    y1=y0+rect_height;
+    if (!rect_width || !rect_height)
+	return;
+    if (rect_width/2<radius) {
+	if (rect_height/2<radius) {
+	    cairo_move_to  (cr, x0, (y0 + y1)/2);
+	    cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+	    cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+	    cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+	    cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+	} else {
+	    cairo_move_to  (cr, x0, y0 + radius);
+	    cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+	    cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+	    cairo_line_to (cr, x1 , y1 - radius);
+	    cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+	    cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+	}
+    } else {
+	if (rect_height/2<radius) {
+	    cairo_move_to  (cr, x0, (y0 + y1)/2);
+	    cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+	    cairo_line_to (cr, x1 - radius, y0);
+	    cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+	    cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+	    cairo_line_to (cr, x0 + radius, y1);
+	    cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+	} else {
+	    cairo_move_to  (cr, x0, y0 + radius);
+	    cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+	    cairo_line_to (cr, x1 - radius, y0);
+	    cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+	    cairo_line_to (cr, x1 , y1 - radius);
+	    cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+	    cairo_line_to (cr, x0 + radius, y1);
+	    cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+	}
+    }
+    cairo_close_path (cr);
+    
+    cairo_pattern_t *pat= 
+	//cairo_pattern_create_linear (0.0, 0.0,  0.0, 1.0);
+        cairo_pattern_create_radial (0.25, 0.24, 0.11, 0.24,  0.14, 0.35);
+    cairo_pattern_set_extend (pat, CAIRO_EXTEND_REFLECT);
+    
+    cairo_pattern_add_color_stop_rgba (pat, 1.0, r, g, b, 1);
+    cairo_pattern_add_color_stop_rgba (pat, 0.0, 1, 1, 1, 1);
+    cairo_set_source (cr, pat);
+    cairo_fill_preserve (cr);
+    cairo_pattern_destroy (pat);
+
+    //cairo_set_source_rgb (cr, 0.5,0.5,1);    cairo_fill_preserve (cr);
+    cairo_set_source_rgba (cr, 0, 0, 0.5, 0.3);
+    cairo_stroke (cr);
+
+    cairo_set_font_size (cr, 0.08);
+    centered_text(cr,x0,y0,rect_width, rect_height, "FLTK loves Cairo!");
+
+}
+// The cairo rendering cb called during Fl_Cairo_Window::draw() :
+static void my_cairo_draw_cb(Fl_Cairo_Window* window, cairo_t* cr) {
+	
+  int w= window->w(), h = window->h(); 
+  
+    cairo_set_line_width (cr, DEF_WIDTH);
+    cairo_scale (cr, w,h);
+
+    round_button(cr,0.1,0.05,0.8,0.2,0.4,0,0,1);
+    round_button(cr,0.1,0.35,0.8,0.2,0.4,1,0,0);
+    round_button(cr,0.1,0.65,0.8,0.2,0.4,0,1,0);
+    return;
+}
+
+int main(int argc, char** argv) {
+#ifdef AUTOLINK
+  Fl::cairo_autolink_context(true);
+#endif
+    Fl_Cairo_Window window(300,300);
+    
+    window.resizable(&window);
+    window.color(FL_WHITE);
+    window.show(argc,argv);
+    window.set_draw_cb(my_cairo_draw_cb);
+    
+    return Fl::run();
+}
+#else
+#include <FL/fl_ask.H>
+
+int main(int argc, char** argv) {
+  fl_message("please configure fltk with CAIRO enabled (--enable-cairo)"); 
+  return 0;
+}
+#endif
+
+//
+// End of "$Id: arc.cxx 5115 2006-05-12 16:00:00Z fabien $".
+//
diff --git a/vc2005/CubeView.vcproj b/vc2005/CubeView.vcproj
index 40fcfeae8..c52ae1a3b 100644
--- a/vc2005/CubeView.vcproj
+++ b/vc2005/CubeView.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="CubeView"

 	ProjectGUID="{E30BB28D-DFA0-479C-B670-8CD872224B38}"

+	RootNamespace="CubeView"

 	>

 	<Platforms>

 		<Platform

@@ -201,6 +202,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\CubeView__0/CubeView.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\CubeView__0/CubeView.pch"

+				AssemblerListingLocation=".\CubeView__0/"

+				ObjectFile=".\CubeView__0/"

+				ProgramDataBaseFileName=".\CubeView__0/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib opengl32.lib comctl32.lib"

+				OutputFile="../test/CubeViewd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\CubeView__0/CubeViewd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\CubeView___/CubeView.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\CubeView___/CubeView.pch"

+				AssemblerListingLocation=".\CubeView___/"

+				ObjectFile=".\CubeView___/"

+				ProgramDataBaseFileName=".\CubeView___/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="../test/CubeView.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\CubeView___/CubeView.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +416,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\CubeView.cxx"

@@ -250,6 +458,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\CubeViewUI.cxx"

@@ -273,6 +500,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\CubeViewUI.fl"

@@ -297,6 +543,26 @@
 					Outputs="..\test\CubeViewUI.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\CubeViewUI.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\CubeViewUI.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/adjuster.vcproj b/vc2005/adjuster.vcproj
index 4a2da46ec..3d3276e17 100644
--- a/vc2005/adjuster.vcproj
+++ b/vc2005/adjuster.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="adjuster"

 	ProjectGUID="{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\adjuster_/adjuster.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\adjuster_/adjuster.pch"

+				AssemblerListingLocation=".\adjuster_/"

+				ObjectFile=".\adjuster_/"

+				ProgramDataBaseFileName=".\adjuster_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/adjusterd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\adjuster_/adjusterd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/adjuster.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/adjuster.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/adjuster.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/adjuster.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/arc.vcproj b/vc2005/arc.vcproj
index 485f16590..9f59ed500 100644
--- a/vc2005/arc.vcproj
+++ b/vc2005/arc.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="arc"

 	ProjectGUID="{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\arc_/arc.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\arc_/arc.pch"

+				AssemblerListingLocation=".\arc_/"

+				ObjectFile=".\arc_/"

+				ProgramDataBaseFileName=".\arc_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/arcd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\arc_/arcd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/arc.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/arc.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/arc.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/arc.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/ask.vcproj b/vc2005/ask.vcproj
index 729292a47..b8f4922b2 100644
--- a/vc2005/ask.vcproj
+++ b/vc2005/ask.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="ask"

 	ProjectGUID="{DB6BAA16-C589-448F-9AB5-5969016549EB}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\ask_/ask.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\ask_/ask.pch"

+				AssemblerListingLocation=".\ask_/"

+				ObjectFile=".\ask_/"

+				ProgramDataBaseFileName=".\ask_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/askd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\ask_/askd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/ask.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/ask.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/ask.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/ask.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/bitmap.vcproj b/vc2005/bitmap.vcproj
index 928a83fe6..f66bde016 100644
--- a/vc2005/bitmap.vcproj
+++ b/vc2005/bitmap.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="bitmap"

 	ProjectGUID="{65B5BB3F-EE54-4604-B49B-7676AED83AAB}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\bitmap_/bitmap.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\bitmap_/bitmap.pch"

+				AssemblerListingLocation=".\bitmap_/"

+				ObjectFile=".\bitmap_/"

+				ProgramDataBaseFileName=".\bitmap_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/bitmapd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\bitmap_/bitmapd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/bitmap.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/bitmap.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/bitmap.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/bitmap.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/boxtype.vcproj b/vc2005/boxtype.vcproj
index 25a3fe00b..15d5320b9 100644
--- a/vc2005/boxtype.vcproj
+++ b/vc2005/boxtype.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="boxtype"

 	ProjectGUID="{E212D4B4-63D9-4D8D-84DB-45C8BC191462}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\boxtype_/boxtype.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\boxtype_/boxtype.pch"

+				AssemblerListingLocation=".\boxtype_/"

+				ObjectFile=".\boxtype_/"

+				ProgramDataBaseFileName=".\boxtype_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/boxtyped.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\boxtype_/boxtyped.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/boxtype.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/boxtype.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/boxtype.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/boxtype.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/browser.vcproj b/vc2005/browser.vcproj
index 7776f2c49..a3a04b776 100644
--- a/vc2005/browser.vcproj
+++ b/vc2005/browser.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="browser"

 	ProjectGUID="{2352F92C-8663-4637-B919-D76F0A9EC05E}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\browser_/browser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\browser_/browser.pch"

+				AssemblerListingLocation=".\browser_/"

+				ObjectFile=".\browser_/"

+				ProgramDataBaseFileName=".\browser_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/browserd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\browser_/browserd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/browser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/browser.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/browser.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/browser.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/button.vcproj b/vc2005/button.vcproj
index 8b37b7668..036d44714 100644
--- a/vc2005/button.vcproj
+++ b/vc2005/button.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="button"

 	ProjectGUID="{0363AC35-F325-4C24-9DB9-E83337D55787}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\button_/button.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\button_/button.pch"

+				AssemblerListingLocation=".\button_/"

+				ObjectFile=".\button_/"

+				ProgramDataBaseFileName=".\button_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/buttond.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\button_/buttond.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/button.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/button.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/button.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/button.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/buttons.vcproj b/vc2005/buttons.vcproj
index bce883371..2d0016528 100644
--- a/vc2005/buttons.vcproj
+++ b/vc2005/buttons.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="buttons"

 	ProjectGUID="{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\buttons_/buttons.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\buttons_/buttons.pch"

+				AssemblerListingLocation=".\buttons_/"

+				ObjectFile=".\buttons_/"

+				ProgramDataBaseFileName=".\buttons_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/buttonsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\buttons_/buttonsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/buttons.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/buttons.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/buttons.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/buttons.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/cairo_test.vcproj b/vc2005/cairo_test.vcproj
new file mode 100644
index 000000000..c9c23e690
--- /dev/null
+++ b/vc2005/cairo_test.vcproj
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8,00"

+	Name="cairo_test"

+	ProjectGUID="{CF98E92E-C789-47E6-A2DA-398EB7991A2B}"

+	RootNamespace="cairo_test"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/cairo_test.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				PrecompiledHeaderFile=".\Release/cairo_test.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/cairo_test.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/cairo_test.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Release/cairo_test.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\cairo_test_"

+			IntermediateDirectory=".\cairo_test_"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\cairo_test_/cairo_test.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				MinimalRebuild="true"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\cairo_test_/cairo_test.pch"

+				AssemblerListingLocation=".\cairo_test_/"

+				ObjectFile=".\cairo_test_/"

+				ProgramDataBaseFileName=".\cairo_test_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/cairo_testd.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\cairo_test_/cairo_testd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\cairo_test_/cairo_test.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\cairo_test_/cairo_test.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				MinimalRebuild="true"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\cairo_test_/cairo_test.pch"

+				AssemblerListingLocation=".\cairo_test_/"

+				ObjectFile=".\cairo_test_/"

+				ProgramDataBaseFileName=".\cairo_test_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/cairo_testd.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\cairo_test_/cairo_testd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\cairo_test_/cairo_test.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/cairo_test.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				PrecompiledHeaderFile=".\Release/cairo_test.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib cairo.lib"

+				OutputFile="../test/cairo_test.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/cairo_test.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\Release/cairo_test.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="..\test\cairo_test.cxx"

+			>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/vc2005/checkers.vcproj b/vc2005/checkers.vcproj
index 0a963ed76..a646fd24d 100644
--- a/vc2005/checkers.vcproj
+++ b/vc2005/checkers.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="checkers"

 	ProjectGUID="{92EEF887-8305-4D00-86B7-D3F98CC7AD87}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\checkers_/checkers.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\checkers_/checkers.pch"

+				AssemblerListingLocation=".\checkers_/"

+				ObjectFile=".\checkers_/"

+				ProgramDataBaseFileName=".\checkers_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/checkersd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\checkers_/checkersd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/checkers.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/checkers.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/checkers.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/checkers.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/clock.vcproj b/vc2005/clock.vcproj
index 0f174ee1e..16992c180 100644
--- a/vc2005/clock.vcproj
+++ b/vc2005/clock.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="clock"

 	ProjectGUID="{122160ED-446E-4B15-8CB4-A2058DC7269A}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\clock_/clock.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\clock_/clock.pch"

+				AssemblerListingLocation=".\clock_/"

+				ObjectFile=".\clock_/"

+				ProgramDataBaseFileName=".\clock_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/clockd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\clock_/clockd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/clock.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/clock.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/clock.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/clock.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/colbrowser.vcproj b/vc2005/colbrowser.vcproj
index e8ad28d01..96a706638 100644
--- a/vc2005/colbrowser.vcproj
+++ b/vc2005/colbrowser.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="colbrowser"

 	ProjectGUID="{D0BC7525-99E7-4247-B860-1B3CF2FF8165}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\colbrowser_/colbrowser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\colbrowser_/colbrowser.pch"

+				AssemblerListingLocation=".\colbrowser_/"

+				ObjectFile=".\colbrowser_/"

+				ProgramDataBaseFileName=".\colbrowser_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/colbrowserd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\colbrowser_/colbrowserd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/colbrowser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/colbrowser.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/colbrowser.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/colbrowser.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/color_chooser.vcproj b/vc2005/color_chooser.vcproj
index ef06e2588..1a1dafa56 100644
--- a/vc2005/color_chooser.vcproj
+++ b/vc2005/color_chooser.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="color_chooser"

 	ProjectGUID="{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}"

 	>

@@ -199,6 +199,192 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\color_chooser_/color_chooser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\color_chooser_/color_chooser.pch"

+				AssemblerListingLocation=".\color_chooser_/"

+				ObjectFile=".\color_chooser_/"

+				ProgramDataBaseFileName=".\color_chooser_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/color_chooserd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\color_chooser_/color_chooserd.pdb"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/color_chooser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/color_chooser.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/color_chooser.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/color_chooser.pdb"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -225,6 +411,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/config.h b/vc2005/config.h
index df4388793..5e080dfd6 100644
--- a/vc2005/config.h
+++ b/vc2005/config.h
@@ -176,6 +176,13 @@
 #define HAVE_LIBJPEG

 

 /*

+ * Do we have Cairo ?

+ */

+

+// uncomment the following for using cairo

+// #define HAVE_CAIRO 1

+

+/*

  * Which header file do we include for libpng?

  */

 

diff --git a/vc2005/cube.vcproj b/vc2005/cube.vcproj
index a19f31577..cdf69a8da 100644
--- a/vc2005/cube.vcproj
+++ b/vc2005/cube.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="cube"

 	ProjectGUID="{0973844B-3E5F-4C38-95FF-E8935243D287}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\cube_/cube.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\cube_/cube.pch"

+				AssemblerListingLocation=".\cube_/"

+				ObjectFile=".\cube_/"

+				ProgramDataBaseFileName=".\cube_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"

+				OutputFile="../test/cubed.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\cube_/cubed.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/cube.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/cube.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="../test/cube.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/cube.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/cursor.vcproj b/vc2005/cursor.vcproj
index f49827ab1..d295ae043 100644
--- a/vc2005/cursor.vcproj
+++ b/vc2005/cursor.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="cursor"

 	ProjectGUID="{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\cursor_/cursor.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\cursor_/cursor.pch"

+				AssemblerListingLocation=".\cursor_/"

+				ObjectFile=".\cursor_/"

+				ProgramDataBaseFileName=".\cursor_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib comctl32.lib"

+				OutputFile="../test/cursord.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\cursor_/cursord.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/cursor.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/cursor.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/cursor.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/cursor.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/curve.vcproj b/vc2005/curve.vcproj
index adcb298b8..47d329115 100644
--- a/vc2005/curve.vcproj
+++ b/vc2005/curve.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="curve"

 	ProjectGUID="{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\curve_/curve.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\curve_/curve.pch"

+				AssemblerListingLocation=".\curve_/"

+				ObjectFile=".\curve_/"

+				ProgramDataBaseFileName=".\curve_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/curved.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\curve_/curved.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/curve.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/curve.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/curve.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/curve.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/demo.vcproj b/vc2005/demo.vcproj
index 2228aab09..4bfb5fb4c 100644
--- a/vc2005/demo.vcproj
+++ b/vc2005/demo.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="demo"

 	ProjectGUID="{09427220-8C9C-498A-8D50-1638D3FB87E5}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\demo_/demo.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\demo_/demo.pch"

+				AssemblerListingLocation=".\demo_/"

+				ObjectFile=".\demo_/"

+				ProgramDataBaseFileName=".\demo_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib comctl32.lib"

+				OutputFile="../test/demod.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\demo_/demod.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/demo.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/demo.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/demo.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/demo.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/doublebuffer.vcproj b/vc2005/doublebuffer.vcproj
index 0ff4b451d..06b3a3602 100644
--- a/vc2005/doublebuffer.vcproj
+++ b/vc2005/doublebuffer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="doublebuffer"

 	ProjectGUID="{EDDBF169-77C1-496E-9EFE-E500107E6E97}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\doublebuffer_/doublebuffer.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\doublebuffer_/doublebuffer.pch"

+				AssemblerListingLocation=".\doublebuffer_/"

+				ObjectFile=".\doublebuffer_/"

+				ProgramDataBaseFileName=".\doublebuffer_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/doublebufferd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\doublebuffer_/doublebufferd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/doublebuffer.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/doublebuffer.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/doublebuffer.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/doublebuffer.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/editor.vcproj b/vc2005/editor.vcproj
index 33a68a802..d4cb1b8c3 100644
--- a/vc2005/editor.vcproj
+++ b/vc2005/editor.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="editor"

 	ProjectGUID="{0BDAEBF1-7A8D-434B-A543-4663464E972D}"

 	>

@@ -203,6 +203,196 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\editor_/editor.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\editor_/editor.pch"

+				AssemblerListingLocation=".\editor_/"

+				ObjectFile=".\editor_/"

+				ProgramDataBaseFileName=".\editor_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../test/editord.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\editor_/editord.pdb"

+				SubSystem="2"

+				EntryPointSymbol="mainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/editor.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories=".,.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/editor.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../test/editor.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/editor.pdb"

+				SubSystem="2"

+				EntryPointSymbol="mainCRTStartup"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -229,6 +419,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fast_slow.vcproj b/vc2005/fast_slow.vcproj
index 8c53991e3..4d6a28906 100644
--- a/vc2005/fast_slow.vcproj
+++ b/vc2005/fast_slow.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fast_slow"

 	ProjectGUID="{2D29D6C9-B4A6-444C-A311-106A9C8A986F}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fast_slow_/fast_slow.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fast_slow_/fast_slow.pch"

+				AssemblerListingLocation=".\fast_slow_/"

+				ObjectFile=".\fast_slow_/"

+				ProgramDataBaseFileName=".\fast_slow_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/fast_slowd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\fast_slow_/fast_slowd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/fast_slow.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fast_slow.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/fast_slow.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/fast_slow.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\fast_slow.fl"

@@ -251,6 +458,26 @@
 					Outputs="..\test\fast_slow.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\fast_slow.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\fast_slow.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/file_chooser.vcproj b/vc2005/file_chooser.vcproj
index 39918e6f3..1a0f75dd3 100644
--- a/vc2005/file_chooser.vcproj
+++ b/vc2005/file_chooser.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="file_chooser"

 	ProjectGUID="{6927F349-29DF-4D60-BC8F-5A3F5E133735}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\file_chooser_/file_chooser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\file_chooser_/file_chooser.pch"

+				AssemblerListingLocation=".\file_chooser_/"

+				ObjectFile=".\file_chooser_/"

+				ProgramDataBaseFileName=".\file_chooser_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/file_chooserd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmtd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\file_chooser_/file_chooserd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/file_chooser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/file_chooser.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../test/file_chooser.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmt"

+				ProgramDatabaseFile=".\Release/file_chooser.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fltk.lib.vcproj b/vc2005/fltk.lib.vcproj
index 6ead1d1b6..31fbaf2cc 100644
--- a/vc2005/fltk.lib.vcproj
+++ b/vc2005/fltk.lib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fltk"

 	ProjectGUID="{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}"

 	RootNamespace="fltk"

@@ -156,6 +156,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/fltk.lib.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1, _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary= "2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fltk.lib.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltk.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -641,6 +783,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_expand.cxx"

@@ -666,6 +829,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_ext.cxx"

@@ -691,6 +875,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_isdir.cxx"

@@ -716,6 +921,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_list.cxx"

@@ -741,6 +967,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_match.cxx"

@@ -766,6 +1013,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_setext.cxx"

@@ -791,6 +1059,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl.cxx"

@@ -816,6 +1105,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_abort.cxx"

@@ -841,6 +1151,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_add_idle.cxx"

@@ -866,6 +1197,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Adjuster.cxx"

@@ -891,6 +1243,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_arc.cxx"

@@ -916,6 +1289,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_arci.cxx"

@@ -941,6 +1335,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_arg.cxx"

@@ -966,6 +1381,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_ask.cxx"

@@ -991,6 +1427,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Bitmap.cxx"

@@ -1016,6 +1473,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Box.cxx"

@@ -1041,6 +1519,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_boxtype.cxx"

@@ -1066,6 +1565,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser.cxx"

@@ -1091,6 +1611,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser_.cxx"

@@ -1116,6 +1657,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser_load.cxx"

@@ -1141,6 +1703,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Button.cxx"

@@ -1166,6 +1749,31 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\src\Fl_Cairo.cxx"

+			>

 		</File>

 		<File

 			RelativePath="..\src\fl_call_main.c"

@@ -1191,6 +1799,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Chart.cxx"

@@ -1216,6 +1845,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Check_Browser.cxx"

@@ -1241,6 +1891,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Check_Button.cxx"

@@ -1266,6 +1937,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Choice.cxx"

@@ -1291,6 +1983,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Clock.cxx"

@@ -1316,6 +2029,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_color.cxx"

@@ -1341,6 +2075,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Color_Chooser.cxx"

@@ -1366,6 +2121,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_compose.cxx"

@@ -1391,6 +2167,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Counter.cxx"

@@ -1416,6 +2213,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_cursor.cxx"

@@ -1441,6 +2259,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_curve.cxx"

@@ -1466,6 +2305,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Dial.cxx"

@@ -1491,6 +2351,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_diamond_box.cxx"

@@ -1516,6 +2397,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_display.cxx"

@@ -1541,6 +2443,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_dnd.cxx"

@@ -1566,6 +2489,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Double_Window.cxx"

@@ -1591,6 +2535,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw.cxx"

@@ -1616,6 +2581,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw_image.cxx"

@@ -1641,6 +2627,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw_pixmap.cxx"

@@ -1666,6 +2673,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_engraved_label.cxx"

@@ -1691,6 +2719,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Browser.cxx"

@@ -1716,6 +2765,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Chooser.cxx"

@@ -1741,6 +2811,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Chooser2.cxx"

@@ -1766,6 +2857,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_file_dir.cxx"

@@ -1791,6 +2903,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Icon.cxx"

@@ -1816,6 +2949,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Input.cxx"

@@ -1841,6 +2995,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_font.cxx"

@@ -1866,6 +3041,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_get_key.cxx"

@@ -1891,6 +3087,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_get_system_colors.cxx"

@@ -1916,6 +3133,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_grab.cxx"

@@ -1941,6 +3179,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Group.cxx"

@@ -1966,6 +3225,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_gtk.cxx"

@@ -1995,6 +3275,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Image.cxx"

@@ -2020,6 +3321,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Input.cxx"

@@ -2045,6 +3367,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Input_.cxx"

@@ -2070,6 +3413,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_labeltype.cxx"

@@ -2095,6 +3459,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Light_Button.cxx"

@@ -2120,6 +3505,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_line_style.cxx"

@@ -2145,6 +3551,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_lock.cxx"

@@ -2170,6 +3597,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu.cxx"

@@ -2195,6 +3643,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_.cxx"

@@ -2220,6 +3689,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_add.cxx"

@@ -2245,6 +3735,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Bar.cxx"

@@ -2270,6 +3781,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Button.cxx"

@@ -2295,6 +3827,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_global.cxx"

@@ -2320,6 +3873,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Window.cxx"

@@ -2345,6 +3919,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Multi_Label.cxx"

@@ -2370,6 +3965,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_open_uri.cxx"

@@ -2399,6 +4015,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_overlay.cxx"

@@ -2424,6 +4061,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_overlay_visual.cxx"

@@ -2449,6 +4107,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Overlay_Window.cxx"

@@ -2474,6 +4153,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_own_colormap.cxx"

@@ -2499,6 +4199,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Pack.cxx"

@@ -2524,6 +4245,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Pixmap.cxx"

@@ -2549,6 +4291,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_plastic.cxx"

@@ -2574,6 +4337,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Positioner.cxx"

@@ -2599,6 +4383,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Preferences.cxx"

@@ -2624,6 +4429,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Progress.cxx"

@@ -2649,6 +4475,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_read_image.cxx"

@@ -2678,6 +4525,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Repeat_Button.cxx"

@@ -2703,6 +4571,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Return_Button.cxx"

@@ -2728,6 +4617,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Roller.cxx"

@@ -2753,6 +4663,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_round_box.cxx"

@@ -2778,6 +4709,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Round_Button.cxx"

@@ -2803,6 +4755,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_rounded_box.cxx"

@@ -2828,6 +4801,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Scroll.cxx"

@@ -2853,6 +4847,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_scroll_area.cxx"

@@ -2878,6 +4893,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Scrollbar.cxx"

@@ -2903,6 +4939,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_set_font.cxx"

@@ -2928,6 +4985,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_set_fonts.cxx"

@@ -2953,6 +5031,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_shadow_box.cxx"

@@ -2978,6 +5077,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Shared_Image.cxx"

@@ -3003,6 +5123,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_shortcut.cxx"

@@ -3028,6 +5169,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_show_colormap.cxx"

@@ -3053,6 +5215,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Single_Window.cxx"

@@ -3078,6 +5261,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Slider.cxx"

@@ -3103,6 +5307,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_symbols.cxx"

@@ -3128,6 +5353,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tabs.cxx"

@@ -3153,6 +5399,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Buffer.cxx"

@@ -3178,6 +5445,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Display.cxx"

@@ -3203,6 +5491,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Editor.cxx"

@@ -3228,6 +5537,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tile.cxx"

@@ -3253,6 +5583,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tiled_Image.cxx"

@@ -3278,6 +5629,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tooltip.cxx"

@@ -3303,6 +5675,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_utf.c"

@@ -3336,6 +5729,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Input.cxx"

@@ -3361,6 +5775,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Output.cxx"

@@ -3386,6 +5821,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Slider.cxx"

@@ -3411,6 +5867,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_vertex.cxx"

@@ -3436,6 +5913,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_visual.cxx"

@@ -3461,6 +5959,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Widget.cxx"

@@ -3486,6 +6005,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window.cxx"

@@ -3511,6 +6051,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_fullscreen.cxx"

@@ -3536,6 +6097,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_hotspot.cxx"

@@ -3561,6 +6143,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_iconize.cxx"

@@ -3586,6 +6189,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Wizard.cxx"

@@ -3611,6 +6235,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_x.cxx"

@@ -3636,6 +6281,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_XBM_Image.cxx"

@@ -3661,6 +6327,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_XPM_Image.cxx"

@@ -3686,6 +6373,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\flstring.c"

@@ -3711,6 +6419,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\xutf8\is_right2left.c"

@@ -3744,6 +6473,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\scandir.c"

@@ -3769,6 +6519,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\screen_xywh.cxx"

@@ -3794,6 +6565,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\vsnprintf.c"

@@ -3819,6 +6611,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fltk.sln b/vc2005/fltk.sln
index 8588413ac..7d2132f8b 100644
--- a/vc2005/fltk.sln
+++ b/vc2005/fltk.sln
@@ -443,296 +443,592 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utf8", "utf8.vcproj", "{ADA
 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = {E070AAFC-9D03-41A3-BC7D-30887EA0D50F}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cairo_test", "cairo_test.vcproj", "{CF98E92E-C789-47E6-A2DA-398EB7991A2B}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Cairo|Win32 = Debug Cairo|Win32

 		Debug|Win32 = Debug|Win32

+		Release Cairo|Win32 = Release Cairo|Win32

 		Release|Win32 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Debug|Win32.Build.0 = Debug|Win32

+		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Release|Win32.ActiveCfg = Release|Win32

 		{E30BB28D-DFA0-479C-B670-8CD872224B38}.Release|Win32.Build.0 = Release|Win32

+		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Debug|Win32.Build.0 = Debug|Win32

+		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Release|Win32.ActiveCfg = Release|Win32

 		{51F6CDA8-3AF3-4DDC-B412-8E5E92F3393B}.Release|Win32.Build.0 = Release|Win32

+		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Debug|Win32.ActiveCfg = Debug|Win32

 		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Debug|Win32.Build.0 = Debug|Win32

+		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Release|Win32.ActiveCfg = Release|Win32

 		{39ADA7A1-A2C1-4F0B-8B92-04E335570C27}.Release|Win32.Build.0 = Release|Win32

+		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Debug|Win32.Build.0 = Debug|Win32

+		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Release|Win32.ActiveCfg = Release|Win32

 		{DB6BAA16-C589-448F-9AB5-5969016549EB}.Release|Win32.Build.0 = Release|Win32

+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Debug|Win32.Build.0 = Debug|Win32

+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Release|Win32.ActiveCfg = Release|Win32

 		{65B5BB3F-EE54-4604-B49B-7676AED83AAB}.Release|Win32.Build.0 = Release|Win32

+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Debug|Win32.Build.0 = Debug|Win32

+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Release|Win32.ActiveCfg = Release|Win32

 		{E212D4B4-63D9-4D8D-84DB-45C8BC191462}.Release|Win32.Build.0 = Release|Win32

+		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Debug|Win32.Build.0 = Debug|Win32

+		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Release|Win32.ActiveCfg = Release|Win32

 		{2352F92C-8663-4637-B919-D76F0A9EC05E}.Release|Win32.Build.0 = Release|Win32

+		{0363AC35-F325-4C24-9DB9-E83337D55787}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{0363AC35-F325-4C24-9DB9-E83337D55787}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{0363AC35-F325-4C24-9DB9-E83337D55787}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0363AC35-F325-4C24-9DB9-E83337D55787}.Debug|Win32.Build.0 = Debug|Win32

+		{0363AC35-F325-4C24-9DB9-E83337D55787}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{0363AC35-F325-4C24-9DB9-E83337D55787}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{0363AC35-F325-4C24-9DB9-E83337D55787}.Release|Win32.ActiveCfg = Release|Win32

 		{0363AC35-F325-4C24-9DB9-E83337D55787}.Release|Win32.Build.0 = Release|Win32

+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Debug|Win32.ActiveCfg = Debug|Win32

 		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Debug|Win32.Build.0 = Debug|Win32

+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Release|Win32.ActiveCfg = Release|Win32

 		{67CE1C24-B0C0-4CD6-8D0F-68513C2398B9}.Release|Win32.Build.0 = Release|Win32

+		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Debug|Win32.ActiveCfg = Debug|Win32

 		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Debug|Win32.Build.0 = Debug|Win32

+		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Release|Win32.ActiveCfg = Release|Win32

 		{92EEF887-8305-4D00-86B7-D3F98CC7AD87}.Release|Win32.Build.0 = Release|Win32

+		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Debug|Win32.ActiveCfg = Debug|Win32

 		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Debug|Win32.Build.0 = Debug|Win32

+		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Release|Win32.ActiveCfg = Release|Win32

 		{122160ED-446E-4B15-8CB4-A2058DC7269A}.Release|Win32.Build.0 = Release|Win32

+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Debug|Win32.Build.0 = Debug|Win32

+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Release|Win32.ActiveCfg = Release|Win32

 		{D0BC7525-99E7-4247-B860-1B3CF2FF8165}.Release|Win32.Build.0 = Release|Win32

+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Debug|Win32.ActiveCfg = Debug|Win32

 		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Debug|Win32.Build.0 = Debug|Win32

+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Release|Win32.ActiveCfg = Release|Win32

 		{BDACB9FC-6769-4A2D-A636-36CC25E3AC75}.Release|Win32.Build.0 = Release|Win32

+		{0973844B-3E5F-4C38-95FF-E8935243D287}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{0973844B-3E5F-4C38-95FF-E8935243D287}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{0973844B-3E5F-4C38-95FF-E8935243D287}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0973844B-3E5F-4C38-95FF-E8935243D287}.Debug|Win32.Build.0 = Debug|Win32

+		{0973844B-3E5F-4C38-95FF-E8935243D287}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{0973844B-3E5F-4C38-95FF-E8935243D287}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{0973844B-3E5F-4C38-95FF-E8935243D287}.Release|Win32.ActiveCfg = Release|Win32

 		{0973844B-3E5F-4C38-95FF-E8935243D287}.Release|Win32.Build.0 = Release|Win32

+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Debug|Win32.Build.0 = Debug|Win32

+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Release|Win32.ActiveCfg = Release|Win32

 		{0D1DB0EE-E997-4550-85D4-BDE209B75AD6}.Release|Win32.Build.0 = Release|Win32

+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Debug|Win32.ActiveCfg = Debug|Win32

 		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Debug|Win32.Build.0 = Debug|Win32

+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Release|Win32.ActiveCfg = Release|Win32

 		{27D45BA6-A403-4A71-B6D6-57DC0CEDCE15}.Release|Win32.Build.0 = Release|Win32

+		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Debug|Win32.ActiveCfg = Debug|Win32

 		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Debug|Win32.Build.0 = Debug|Win32

+		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Release|Win32.ActiveCfg = Release|Win32

 		{09427220-8C9C-498A-8D50-1638D3FB87E5}.Release|Win32.Build.0 = Release|Win32

+		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Debug|Win32.ActiveCfg = Debug|Win32

 		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Debug|Win32.Build.0 = Debug|Win32

+		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Release|Win32.ActiveCfg = Release|Win32

 		{EDDBF169-77C1-496E-9EFE-E500107E6E97}.Release|Win32.Build.0 = Release|Win32

+		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Debug|Win32.Build.0 = Debug|Win32

+		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Release|Win32.ActiveCfg = Release|Win32

 		{0BDAEBF1-7A8D-434B-A543-4663464E972D}.Release|Win32.Build.0 = Release|Win32

+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Debug|Win32.Build.0 = Debug|Win32

+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Release|Win32.ActiveCfg = Release|Win32

 		{2D29D6C9-B4A6-444C-A311-106A9C8A986F}.Release|Win32.Build.0 = Release|Win32

+		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Debug|Win32.ActiveCfg = Debug|Win32

 		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Debug|Win32.Build.0 = Debug|Win32

+		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Release|Win32.ActiveCfg = Release|Win32

 		{6927F349-29DF-4D60-BC8F-5A3F5E133735}.Release|Win32.Build.0 = Release|Win32

+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Debug|Win32.Build.0 = Debug|Win32

+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Release|Win32.ActiveCfg = Release|Win32

 		{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}.Release|Win32.Build.0 = Release|Win32

+		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Debug|Win32.Build.0 = Debug|Win32

+		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Release|Win32.ActiveCfg = Release|Win32

 		{F0B8F4BD-955D-43CB-980C-805364D04A25}.Release|Win32.Build.0 = Release|Win32

+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Debug|Win32.Build.0 = Debug|Win32

+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Release|Win32.ActiveCfg = Release|Win32

 		{C17BAB42-F00B-4F71-9DF6-A921511C89EE}.Release|Win32.Build.0 = Release|Win32

+		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Debug|Win32.Build.0 = Debug|Win32

+		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Release|Win32.ActiveCfg = Release|Win32

 		{F7974A9C-C255-4385-96BC-E24EE0816F7C}.Release|Win32.Build.0 = Release|Win32

+		{6E8E1663-B88D-4454-ADF2-279666A93306}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{6E8E1663-B88D-4454-ADF2-279666A93306}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{6E8E1663-B88D-4454-ADF2-279666A93306}.Debug|Win32.ActiveCfg = Debug|Win32

 		{6E8E1663-B88D-4454-ADF2-279666A93306}.Debug|Win32.Build.0 = Debug|Win32

+		{6E8E1663-B88D-4454-ADF2-279666A93306}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{6E8E1663-B88D-4454-ADF2-279666A93306}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{6E8E1663-B88D-4454-ADF2-279666A93306}.Release|Win32.ActiveCfg = Release|Win32

 		{6E8E1663-B88D-4454-ADF2-279666A93306}.Release|Win32.Build.0 = Release|Win32

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Debug|Win32.Build.0 = Debug|Win32

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Release|Win32.ActiveCfg = Release|Win32

 		{8AED3078-8CD8-40C9-A8FF-46080024F1EB}.Release|Win32.Build.0 = Release|Win32

+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Debug|Win32.Build.0 = Debug|Win32

+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Release|Win32.ActiveCfg = Release|Win32

 		{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}.Release|Win32.Build.0 = Release|Win32

+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Debug|Win32.Build.0 = Debug|Win32

+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Release|Win32.ActiveCfg = Release|Win32

 		{B1749154-F87B-489D-B4B0-ABD5ED20A96F}.Release|Win32.Build.0 = Release|Win32

+		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Debug|Win32.Build.0 = Debug|Win32

+		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Release|Win32.ActiveCfg = Release|Win32

 		{58A83386-65E6-4F22-8712-8B6B7E62913D}.Release|Win32.Build.0 = Release|Win32

+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Debug|Win32.Build.0 = Debug|Win32

+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Release|Win32.ActiveCfg = Release|Win32

 		{2147B9FD-7D65-4854-9770-D7B8767DB9AE}.Release|Win32.Build.0 = Release|Win32

+		{8D8D210D-F628-48BB-9127-D8003DF22018}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{8D8D210D-F628-48BB-9127-D8003DF22018}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{8D8D210D-F628-48BB-9127-D8003DF22018}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8D8D210D-F628-48BB-9127-D8003DF22018}.Debug|Win32.Build.0 = Debug|Win32

+		{8D8D210D-F628-48BB-9127-D8003DF22018}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{8D8D210D-F628-48BB-9127-D8003DF22018}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{8D8D210D-F628-48BB-9127-D8003DF22018}.Release|Win32.ActiveCfg = Release|Win32

 		{8D8D210D-F628-48BB-9127-D8003DF22018}.Release|Win32.Build.0 = Release|Win32

+		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Debug|Win32.ActiveCfg = Debug|Win32

 		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Debug|Win32.Build.0 = Debug|Win32

+		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Release|Win32.ActiveCfg = Release|Win32

 		{BFE8CC78-6B58-4305-A096-796A3088BB26}.Release|Win32.Build.0 = Release|Win32

+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Debug|Win32.ActiveCfg = Debug|Win32

 		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Debug|Win32.Build.0 = Debug|Win32

+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Release|Win32.ActiveCfg = Release|Win32

 		{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}.Release|Win32.Build.0 = Release|Win32

+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Debug|Win32.ActiveCfg = Debug|Win32

 		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Debug|Win32.Build.0 = Debug|Win32

+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Release|Win32.ActiveCfg = Release|Win32

 		{9F3F86DA-3CC5-481F-8201-166933B5C8FF}.Release|Win32.Build.0 = Release|Win32

+		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Debug|Win32.Build.0 = Debug|Win32

+		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Release|Win32.ActiveCfg = Release|Win32

 		{37C32832-DCE4-4BAA-9306-826064B30CCB}.Release|Win32.Build.0 = Release|Win32

+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Debug|Win32.Build.0 = Debug|Win32

+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Release|Win32.ActiveCfg = Release|Win32

 		{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}.Release|Win32.Build.0 = Release|Win32

+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Debug|Win32.Build.0 = Debug|Win32

+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Release|Win32.ActiveCfg = Release|Win32

 		{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}.Release|Win32.Build.0 = Release|Win32

+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Debug|Win32.ActiveCfg = Debug|Win32

 		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Debug|Win32.Build.0 = Debug|Win32

+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Release|Win32.ActiveCfg = Release|Win32

 		{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}.Release|Win32.Build.0 = Release|Win32

+		{4DFA9F84-0457-4FE4-8008-283270610487}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{4DFA9F84-0457-4FE4-8008-283270610487}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{4DFA9F84-0457-4FE4-8008-283270610487}.Debug|Win32.ActiveCfg = Debug|Win32

 		{4DFA9F84-0457-4FE4-8008-283270610487}.Debug|Win32.Build.0 = Debug|Win32

+		{4DFA9F84-0457-4FE4-8008-283270610487}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{4DFA9F84-0457-4FE4-8008-283270610487}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{4DFA9F84-0457-4FE4-8008-283270610487}.Release|Win32.ActiveCfg = Release|Win32

 		{4DFA9F84-0457-4FE4-8008-283270610487}.Release|Win32.Build.0 = Release|Win32

+		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Debug|Win32.ActiveCfg = Debug|Win32

 		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Debug|Win32.Build.0 = Debug|Win32

+		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Release|Win32.ActiveCfg = Release|Win32

 		{C3E7B77C-EED2-4046-9A30-9446C6F096A0}.Release|Win32.Build.0 = Release|Win32

+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Debug|Win32.Build.0 = Debug|Win32

+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Release|Win32.ActiveCfg = Release|Win32

 		{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}.Release|Win32.Build.0 = Release|Win32

+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Debug|Win32.ActiveCfg = Debug|Win32

 		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Debug|Win32.Build.0 = Debug|Win32

+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Release|Win32.ActiveCfg = Release|Win32

 		{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}.Release|Win32.Build.0 = Release|Win32

+		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Debug|Win32.ActiveCfg = Debug|Win32

 		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Debug|Win32.Build.0 = Debug|Win32

+		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Release|Win32.ActiveCfg = Release|Win32

 		{78079B1F-152B-4E83-87CB-364586AB3AAC}.Release|Win32.Build.0 = Release|Win32

+		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Debug|Win32.Build.0 = Debug|Win32

+		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Release|Win32.ActiveCfg = Release|Win32

 		{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}.Release|Win32.Build.0 = Release|Win32

+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Debug|Win32.Build.0 = Debug|Win32

+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Release|Win32.ActiveCfg = Release|Win32

 		{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}.Release|Win32.Build.0 = Release|Win32

+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Debug|Win32.ActiveCfg = Debug|Win32

 		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Debug|Win32.Build.0 = Debug|Win32

+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Release|Win32.ActiveCfg = Release|Win32

 		{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}.Release|Win32.Build.0 = Release|Win32

+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Debug|Win32.Build.0 = Debug|Win32

+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Release|Win32.ActiveCfg = Release|Win32

 		{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}.Release|Win32.Build.0 = Release|Win32

+		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Debug|Win32.Build.0 = Debug|Win32

+		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Release|Win32.ActiveCfg = Release|Win32

 		{3B0BF144-5D75-4D4A-BF75-7347186C808F}.Release|Win32.Build.0 = Release|Win32

+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Debug|Win32.ActiveCfg = Debug|Win32

 		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Debug|Win32.Build.0 = Debug|Win32

+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Release|Win32.ActiveCfg = Release|Win32

 		{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}.Release|Win32.Build.0 = Release|Win32

+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Debug|Win32.Build.0 = Debug|Win32

+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Release|Win32.ActiveCfg = Release|Win32

 		{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}.Release|Win32.Build.0 = Release|Win32

+		{289C605C-94CC-437F-836B-2FE41528EEEC}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{289C605C-94CC-437F-836B-2FE41528EEEC}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{289C605C-94CC-437F-836B-2FE41528EEEC}.Debug|Win32.ActiveCfg = Debug|Win32

 		{289C605C-94CC-437F-836B-2FE41528EEEC}.Debug|Win32.Build.0 = Debug|Win32

+		{289C605C-94CC-437F-836B-2FE41528EEEC}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{289C605C-94CC-437F-836B-2FE41528EEEC}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{289C605C-94CC-437F-836B-2FE41528EEEC}.Release|Win32.ActiveCfg = Release|Win32

 		{289C605C-94CC-437F-836B-2FE41528EEEC}.Release|Win32.Build.0 = Release|Win32

+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Debug|Win32.Build.0 = Debug|Win32

+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Release|Win32.ActiveCfg = Release|Win32

 		{D04E36D7-1C68-43E6-BE30-A7793CE3C799}.Release|Win32.Build.0 = Release|Win32

+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Debug|Win32.ActiveCfg = Debug|Win32

 		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Debug|Win32.Build.0 = Debug|Win32

+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Release|Win32.ActiveCfg = Release|Win32

 		{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}.Release|Win32.Build.0 = Release|Win32

+		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Debug|Win32.ActiveCfg = Debug|Win32

 		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Debug|Win32.Build.0 = Debug|Win32

+		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Release|Win32.ActiveCfg = Release|Win32

 		{46771042-C840-4314-BA3C-C5BC2FBD7CBB}.Release|Win32.Build.0 = Release|Win32

+		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Debug|Win32.Build.0 = Debug|Win32

+		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Release|Win32.ActiveCfg = Release|Win32

 		{2E03AF33-56A1-4366-B016-184CD96F3B56}.Release|Win32.Build.0 = Release|Win32

+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Debug|Win32.ActiveCfg = Debug|Win32

 		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Debug|Win32.Build.0 = Debug|Win32

+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Release|Win32.ActiveCfg = Release|Win32

 		{97541B63-87AA-4ACE-BBF5-175F8D1389EC}.Release|Win32.Build.0 = Release|Win32

+		{45797F58-624B-4FA0-A7A3-5956114D8215}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{45797F58-624B-4FA0-A7A3-5956114D8215}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{45797F58-624B-4FA0-A7A3-5956114D8215}.Debug|Win32.ActiveCfg = Debug|Win32

 		{45797F58-624B-4FA0-A7A3-5956114D8215}.Debug|Win32.Build.0 = Debug|Win32

+		{45797F58-624B-4FA0-A7A3-5956114D8215}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{45797F58-624B-4FA0-A7A3-5956114D8215}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{45797F58-624B-4FA0-A7A3-5956114D8215}.Release|Win32.ActiveCfg = Release|Win32

 		{45797F58-624B-4FA0-A7A3-5956114D8215}.Release|Win32.Build.0 = Release|Win32

+		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Debug|Win32.ActiveCfg = Debug|Win32

 		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Debug|Win32.Build.0 = Debug|Win32

+		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Release|Win32.ActiveCfg = Release|Win32

 		{7A2467D2-B03A-4964-A289-EF233EB39F69}.Release|Win32.Build.0 = Release|Win32

+		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Debug|Win32.ActiveCfg = Debug|Win32

 		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Debug|Win32.Build.0 = Debug|Win32

+		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Release|Win32.ActiveCfg = Release|Win32

 		{AE750416-51BA-485C-BD76-EF11B4536EE8}.Release|Win32.Build.0 = Release|Win32

+		{3E822491-B134-43B0-A40E-9348FFAB527F}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{3E822491-B134-43B0-A40E-9348FFAB527F}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Debug|Win32.ActiveCfg = Debug|Win32

 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Debug|Win32.Build.0 = Debug|Win32

+		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release|Win32.ActiveCfg = Release|Win32

 		{3E822491-B134-43B0-A40E-9348FFAB527F}.Release|Win32.Build.0 = Release|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug|Win32.ActiveCfg = Debug|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Debug|Win32.Build.0 = Debug|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release|Win32.ActiveCfg = Release|Win32

 		{AF932F77-1804-4DA4-A6DC-950795D6AFC1}.Release|Win32.Build.0 = Release|Win32

+		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug|Win32.ActiveCfg = Debug|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Debug|Win32.Build.0 = Debug|Win32

+		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Release|Win32.ActiveCfg = Release|Win32

 		{45236F71-7031-40BC-ADCD-0535A64C04B0}.Release|Win32.Build.0 = Release|Win32

+		{28D24031-1A17-497A-B926-59CF78076DED}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{28D24031-1A17-497A-B926-59CF78076DED}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{28D24031-1A17-497A-B926-59CF78076DED}.Debug|Win32.ActiveCfg = Debug|Win32

 		{28D24031-1A17-497A-B926-59CF78076DED}.Debug|Win32.Build.0 = Debug|Win32

+		{28D24031-1A17-497A-B926-59CF78076DED}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{28D24031-1A17-497A-B926-59CF78076DED}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{28D24031-1A17-497A-B926-59CF78076DED}.Release|Win32.ActiveCfg = Release|Win32

 		{28D24031-1A17-497A-B926-59CF78076DED}.Release|Win32.Build.0 = Release|Win32

+		{23F17042-704E-4198-8017-A8584E884CF7}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{23F17042-704E-4198-8017-A8584E884CF7}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{23F17042-704E-4198-8017-A8584E884CF7}.Debug|Win32.ActiveCfg = Debug|Win32

 		{23F17042-704E-4198-8017-A8584E884CF7}.Debug|Win32.Build.0 = Debug|Win32

+		{23F17042-704E-4198-8017-A8584E884CF7}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{23F17042-704E-4198-8017-A8584E884CF7}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{23F17042-704E-4198-8017-A8584E884CF7}.Release|Win32.ActiveCfg = Release|Win32

 		{23F17042-704E-4198-8017-A8584E884CF7}.Release|Win32.Build.0 = Release|Win32

+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Debug|Win32.ActiveCfg = Debug|Win32

 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Debug|Win32.Build.0 = Debug|Win32

+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release|Win32.ActiveCfg = Release|Win32

 		{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}.Release|Win32.Build.0 = Release|Win32

+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug|Win32.ActiveCfg = Debug|Win32

 		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Debug|Win32.Build.0 = Debug|Win32

+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release|Win32.ActiveCfg = Release|Win32

 		{08B82852-90B3-4767-A5D2-F0A4FCCB2377}.Release|Win32.Build.0 = Release|Win32

+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Debug|Win32.Build.0 = Debug|Win32

+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release|Win32.ActiveCfg = Release|Win32

 		{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}.Release|Win32.Build.0 = Release|Win32

+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Debug|Win32.Build.0 = Debug|Win32

+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release|Win32.ActiveCfg = Release|Win32

 		{D640A221-F95A-40FF-AC0E-0E8B615C7681}.Release|Win32.Build.0 = Release|Win32

+		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Debug|Win32.ActiveCfg = Debug|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Debug|Win32.Build.0 = Debug|Win32

+		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release|Win32.ActiveCfg = Release|Win32

 		{50651D04-C8F7-4C2B-B412-0848573BDF88}.Release|Win32.Build.0 = Release|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

 		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug|Win32.ActiveCfg = Debug|Win32

 		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Debug|Win32.Build.0 = Debug|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

 		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release|Win32.ActiveCfg = Release|Win32

 		{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}.Release|Win32.Build.0 = Release|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Debug Cairo|Win32.ActiveCfg = Debug Cairo|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Debug Cairo|Win32.Build.0 = Debug Cairo|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Debug|Win32.Build.0 = Debug|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Release Cairo|Win32.ActiveCfg = Release Cairo|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Release Cairo|Win32.Build.0 = Release Cairo|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Release|Win32.ActiveCfg = Release|Win32

+		{CF98E92E-C789-47E6-A2DA-398EB7991A2B}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/vc2005/fltkdll.vcproj b/vc2005/fltkdll.vcproj
index 242e89334..9b61bff19 100644
--- a/vc2005/fltkdll.vcproj
+++ b/vc2005/fltkdll.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fltkdll"

 	ProjectGUID="{F0B8F4BD-955D-43CB-980C-805364D04A25}"

 	RootNamespace="fltkdll"

@@ -167,7 +167,101 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="opengl32.lib comctl32.lib"

+				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="fltkdlld.dll"

+				Version="1.0"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="fltkdlld.pdb"

+				SubSystem="2"

+				ImportLibrary=".\../test/fltkdlld.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\../test/fltkdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..;..\zlib,..\png,..\jpeg"

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fltkdlld/fltkdll.pch"

+				AssemblerListingLocation=".\fltkdlld/"

+				ObjectFile=".\fltkdlld/"

+				ProgramDataBaseFileName=".\fltkdlld/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"

 				OutputFile="fltkdlld.dll"

 				Version="1.0"

 				LinkIncremental="1"

@@ -203,6 +297,101 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\../test/fltkdll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..,..\zlib,..\png,..\jpeg"

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fltkdll/fltkdll.pch"

+				AssemblerListingLocation=".\fltkdll/"

+				ObjectFile=".\fltkdll/"

+				ProgramDataBaseFileName=".\fltkdll/"

+				WarningLevel="1"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="fltkdll.dll"

+				Version="1.0"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				ProgramDatabaseFile="fltkdll.pdb"

+				SubSystem="2"

+				ImportLibrary=".\../test/fltkdll.lib"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -233,6 +422,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_expand.cxx"

@@ -256,6 +464,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_ext.cxx"

@@ -279,6 +506,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_isdir.cxx"

@@ -302,6 +548,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_list.cxx"

@@ -325,6 +590,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_match.cxx"

@@ -348,6 +632,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\filename_setext.cxx"

@@ -371,6 +674,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl.cxx"

@@ -394,6 +716,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_abort.cxx"

@@ -417,6 +758,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_add_idle.cxx"

@@ -440,6 +800,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Adjuster.cxx"

@@ -463,6 +842,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_arc.cxx"

@@ -486,6 +884,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_arci.cxx"

@@ -509,6 +926,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_arg.cxx"

@@ -532,6 +968,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_ask.cxx"

@@ -555,6 +1010,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Bitmap.cxx"

@@ -578,6 +1052,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_BMP_Image.cxx"

@@ -601,6 +1094,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Box.cxx"

@@ -624,6 +1136,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_boxtype.cxx"

@@ -647,6 +1178,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser.cxx"

@@ -670,6 +1220,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser_.cxx"

@@ -693,6 +1262,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Browser_load.cxx"

@@ -716,6 +1304,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Button.cxx"

@@ -739,6 +1346,29 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\src\Fl_Cairo.cxx"

+			>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Chart.cxx"

@@ -762,6 +1392,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Check_Browser.cxx"

@@ -785,6 +1434,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Check_Button.cxx"

@@ -808,6 +1476,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Choice.cxx"

@@ -831,6 +1518,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Clock.cxx"

@@ -854,6 +1560,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_color.cxx"

@@ -877,6 +1602,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Color_Chooser.cxx"

@@ -900,6 +1644,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_compose.cxx"

@@ -923,6 +1686,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Counter.cxx"

@@ -946,6 +1728,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_cursor.cxx"

@@ -969,6 +1770,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_curve.cxx"

@@ -992,6 +1812,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Dial.cxx"

@@ -1015,6 +1854,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_diamond_box.cxx"

@@ -1038,6 +1896,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_display.cxx"

@@ -1061,6 +1938,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_dnd.cxx"

@@ -1084,6 +1980,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Double_Window.cxx"

@@ -1107,6 +2022,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw.cxx"

@@ -1130,6 +2064,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw_image.cxx"

@@ -1153,6 +2106,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_draw_pixmap.cxx"

@@ -1176,6 +2148,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_engraved_label.cxx"

@@ -1199,6 +2190,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Browser.cxx"

@@ -1222,6 +2232,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Chooser.cxx"

@@ -1245,6 +2274,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Chooser2.cxx"

@@ -1268,6 +2316,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_file_dir.cxx"

@@ -1291,6 +2358,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Icon.cxx"

@@ -1314,6 +2400,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Icon2.cxx"

@@ -1337,6 +2442,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Input.cxx"

@@ -1360,6 +2484,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_font.cxx"

@@ -1383,6 +2526,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_get_key.cxx"

@@ -1406,6 +2568,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_get_system_colors.cxx"

@@ -1429,6 +2610,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_GIF_Image.cxx"

@@ -1452,6 +2652,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Gl_Choice.cxx"

@@ -1475,6 +2694,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Gl_Overlay.cxx"

@@ -1498,6 +2736,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Gl_Window.cxx"

@@ -1521,6 +2778,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_grab.cxx"

@@ -1544,6 +2820,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Group.cxx"

@@ -1567,6 +2862,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_gtk.cxx"

@@ -1594,6 +2908,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Help_View.cxx"

@@ -1617,6 +2950,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Image.cxx"

@@ -1640,6 +2992,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_images_core.cxx"

@@ -1663,6 +3034,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Input.cxx"

@@ -1686,6 +3076,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Input_.cxx"

@@ -1709,6 +3118,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_JPEG_Image.cxx"

@@ -1732,6 +3160,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_labeltype.cxx"

@@ -1755,6 +3202,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Light_Button.cxx"

@@ -1778,6 +3244,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_line_style.cxx"

@@ -1801,6 +3286,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_lock.cxx"

@@ -1824,6 +3328,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu.cxx"

@@ -1847,6 +3370,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_.cxx"

@@ -1870,6 +3412,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_add.cxx"

@@ -1893,6 +3454,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Bar.cxx"

@@ -1916,6 +3496,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Button.cxx"

@@ -1939,6 +3538,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_global.cxx"

@@ -1962,6 +3580,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Menu_Window.cxx"

@@ -1985,6 +3622,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Multi_Label.cxx"

@@ -2008,6 +3664,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_open_uri.cxx"

@@ -2035,6 +3710,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_overlay.cxx"

@@ -2058,6 +3752,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_overlay_visual.cxx"

@@ -2081,6 +3794,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Overlay_Window.cxx"

@@ -2104,6 +3836,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_own_colormap.cxx"

@@ -2127,6 +3878,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Pack.cxx"

@@ -2150,6 +3920,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Pixmap.cxx"

@@ -2173,6 +3962,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_plastic.cxx"

@@ -2196,6 +4004,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_PNG_Image.cxx"

@@ -2219,6 +4046,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_PNM_Image.cxx"

@@ -2242,6 +4088,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Positioner.cxx"

@@ -2265,6 +4130,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Preferences.cxx"

@@ -2288,6 +4172,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Progress.cxx"

@@ -2311,6 +4214,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_read_image.cxx"

@@ -2338,6 +4260,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Repeat_Button.cxx"

@@ -2361,6 +4302,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Return_Button.cxx"

@@ -2384,6 +4344,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Roller.cxx"

@@ -2407,6 +4386,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_round_box.cxx"

@@ -2430,6 +4428,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Round_Button.cxx"

@@ -2453,6 +4470,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_rounded_box.cxx"

@@ -2476,6 +4512,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Scroll.cxx"

@@ -2499,6 +4554,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_scroll_area.cxx"

@@ -2522,6 +4596,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Scrollbar.cxx"

@@ -2545,6 +4638,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_set_font.cxx"

@@ -2568,6 +4680,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_set_fonts.cxx"

@@ -2591,6 +4722,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_shadow_box.cxx"

@@ -2614,6 +4764,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Shared_Image.cxx"

@@ -2637,6 +4806,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_shortcut.cxx"

@@ -2660,6 +4848,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_show_colormap.cxx"

@@ -2683,6 +4890,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Single_Window.cxx"

@@ -2706,6 +4932,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Slider.cxx"

@@ -2729,6 +4974,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_symbols.cxx"

@@ -2752,6 +5016,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tabs.cxx"

@@ -2775,6 +5058,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Buffer.cxx"

@@ -2798,6 +5100,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Display.cxx"

@@ -2821,6 +5142,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Text_Editor.cxx"

@@ -2844,6 +5184,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tile.cxx"

@@ -2867,6 +5226,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tiled_Image.cxx"

@@ -2890,6 +5268,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Tooltip.cxx"

@@ -2913,6 +5310,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_utf.c"

@@ -2944,6 +5360,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Input.cxx"

@@ -2967,6 +5402,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Output.cxx"

@@ -2990,6 +5444,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Value_Slider.cxx"

@@ -3013,6 +5486,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_vertex.cxx"

@@ -3036,6 +5528,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_visual.cxx"

@@ -3059,6 +5570,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Widget.cxx"

@@ -3082,6 +5612,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window.cxx"

@@ -3105,6 +5654,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_fullscreen.cxx"

@@ -3128,6 +5696,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_hotspot.cxx"

@@ -3151,6 +5738,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Window_iconize.cxx"

@@ -3174,6 +5780,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Wizard.cxx"

@@ -3197,6 +5822,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_x.cxx"

@@ -3220,6 +5864,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_XBM_Image.cxx"

@@ -3243,6 +5906,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_XPM_Image.cxx"

@@ -3266,6 +5948,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\flstring.c"

@@ -3289,6 +5990,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_bitmap.cxx"

@@ -3312,6 +6032,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_compatability.cxx"

@@ -3335,6 +6074,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_free.cxx"

@@ -3358,6 +6116,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_fselect.cxx"

@@ -3381,6 +6158,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_pixmap.cxx"

@@ -3404,6 +6200,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_timer.cxx"

@@ -3427,6 +6242,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\freeglut_geometry.cxx"

@@ -3466,6 +6300,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\gl_start.cxx"

@@ -3489,6 +6342,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\glut_compatability.cxx"

@@ -3512,6 +6384,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\glut_font.cxx"

@@ -3535,6 +6426,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\xutf8\is_right2left.c"

@@ -3566,6 +6476,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\scandir.c"

@@ -3589,6 +6518,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\screen_xywh.cxx"

@@ -3612,6 +6560,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\vsnprintf.c"

@@ -3635,6 +6602,25 @@
 					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fltkforms.vcproj b/vc2005/fltkforms.vcproj
index 07521b4e4..6cf394059 100644
--- a/vc2005/fltkforms.vcproj
+++ b/vc2005/fltkforms.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fltkforms"

 	ProjectGUID="{C17BAB42-F00B-4F71-9DF6-A921511C89EE}"

+	RootNamespace="fltkforms"

 	>

 	<Platforms>

 		<Platform

@@ -155,6 +156,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/fltkforms.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkformsd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary= "2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fltkforms.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkforms.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -183,6 +326,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_compatability.cxx"

@@ -208,6 +372,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_free.cxx"

@@ -233,6 +418,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_fselect.cxx"

@@ -258,6 +464,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_pixmap.cxx"

@@ -283,6 +510,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\forms_timer.cxx"

@@ -308,6 +556,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fltkgl.vcproj b/vc2005/fltkgl.vcproj
index 7ff3e995c..f2f47fe84 100644
--- a/vc2005/fltkgl.vcproj
+++ b/vc2005/fltkgl.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fltkgl"

 	ProjectGUID="{F7974A9C-C255-4385-96BC-E24EE0816F7C}"

+	RootNamespace="fltkgl"

 	>

 	<Platforms>

 		<Platform

@@ -155,6 +156,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/fltkgl.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkgld.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary= "2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fltkgl.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkgl.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -183,6 +326,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Gl_Overlay.cxx"

@@ -208,6 +372,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Gl_Window.cxx"

@@ -233,6 +418,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\freeglut_geometry.cxx"

@@ -274,6 +480,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\gl_start.cxx"

@@ -299,6 +526,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\glut_compatability.cxx"

@@ -324,6 +572,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\glut_font.cxx"

@@ -349,6 +618,27 @@
 					BrowseInformation="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fltkimages.vcproj b/vc2005/fltkimages.vcproj
index ba61af8f9..227e9dd60 100644
--- a/vc2005/fltkimages.vcproj
+++ b/vc2005/fltkimages.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fltkimages"

 	ProjectGUID="{6E8E1663-B88D-4454-ADF2-279666A93306}"

+	RootNamespace="fltkimages"

 	>

 	<Platforms>

 		<Platform

@@ -155,6 +156,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/fltkimages.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkimagesd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary= "2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fltkimages.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkimages.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -183,6 +326,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_File_Icon2.cxx"

@@ -208,6 +372,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_GIF_Image.cxx"

@@ -233,6 +418,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_Help_Dialog.cxx"

@@ -258,6 +464,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\fl_images_core.cxx"

@@ -283,6 +510,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_JPEG_Image.cxx"

@@ -308,6 +556,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_PNG_Image.cxx"

@@ -333,6 +602,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\src\Fl_PNM_Image.cxx"

@@ -358,6 +648,27 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					BrowseInformation="1"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fluid.vcproj b/vc2005/fluid.vcproj
index 998f41f50..ef14ec3a0 100644
--- a/vc2005/fluid.vcproj
+++ b/vc2005/fluid.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fluid"

 	ProjectGUID="{8AED3078-8CD8-40C9-A8FF-46080024F1EB}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fluid__0/fluid.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fluid__0/fluid.pch"

+				AssemblerListingLocation=".\fluid__0/"

+				ObjectFile=".\fluid__0/"

+				ProgramDataBaseFileName=".\fluid__0/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib comctl32.lib"

+				OutputFile="../fluid/fluidd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmtd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\fluid__0/fluidd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fluid___/fluid.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fluid___/fluid.pch"

+				AssemblerListingLocation=".\fluid___/"

+				ObjectFile=".\fluid___/"

+				ProgramDataBaseFileName=".\fluid___/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../fluid/fluid.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmt"

+				ProgramDatabaseFile=".\fluid___/fluid.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -228,6 +416,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\align_widget.cxx"

@@ -252,6 +460,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\alignment_panel.cxx"

@@ -276,6 +504,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\code.cxx"

@@ -300,6 +548,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\CodeEditor.cxx"

@@ -324,6 +592,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\factory.cxx"

@@ -348,6 +636,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\file.cxx"

@@ -372,6 +680,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Function_Type.cxx"

@@ -396,6 +724,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Group_Type.cxx"

@@ -420,6 +768,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Menu_Type.cxx"

@@ -444,6 +812,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Type.cxx"

@@ -468,6 +856,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Widget_Type.cxx"

@@ -492,6 +900,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fl_Window_Type.cxx"

@@ -516,6 +944,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\fluid.cxx"

@@ -540,6 +988,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\Fluid_Image.cxx"

@@ -564,6 +1032,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\function_panel.cxx"

@@ -588,6 +1076,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\template_panel.cxx"

@@ -616,6 +1124,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\fluid\widget_panel.cxx"

@@ -640,6 +1168,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fonts.vcproj b/vc2005/fonts.vcproj
index ac5b5532c..612036ab2 100644
--- a/vc2005/fonts.vcproj
+++ b/vc2005/fonts.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fonts"

 	ProjectGUID="{DF2A883A-7356-4603-9CB1-E8F1E6B1549D}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fonts_/fonts.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fonts_/fonts.pch"

+				AssemblerListingLocation=".\fonts_/"

+				ObjectFile=".\fonts_/"

+				ProgramDataBaseFileName=".\fonts_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/fontsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\fonts_/fontsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/fonts.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fonts.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/fonts.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/fonts.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/forms.vcproj b/vc2005/forms.vcproj
index 47484aab4..6f9ce0f04 100644
--- a/vc2005/forms.vcproj
+++ b/vc2005/forms.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="forms"

 	ProjectGUID="{B1749154-F87B-489D-B4B0-ABD5ED20A96F}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\forms_/forms.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\forms_/forms.pch"

+				AssemblerListingLocation=".\forms_/"

+				ObjectFile=".\forms_/"

+				ProgramDataBaseFileName=".\forms_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/formsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\forms_/formsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/forms.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/forms.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/forms.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/forms.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fractals.vcproj b/vc2005/fractals.vcproj
index d67d3b43e..4562a3337 100644
--- a/vc2005/fractals.vcproj
+++ b/vc2005/fractals.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fractals"

 	ProjectGUID="{58A83386-65E6-4F22-8712-8B6B7E62913D}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fractals_/fractals.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fractals_/fractals.pch"

+				AssemblerListingLocation=".\fractals_/"

+				ObjectFile=".\fractals_/"

+				ProgramDataBaseFileName=".\fractals_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"

+				OutputFile="../test/fractalsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\fractals_/fractalsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/fractals.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fractals.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="../test/fractals.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/fractals.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\fracviewer.cxx"

@@ -250,6 +457,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/fullscreen.vcproj b/vc2005/fullscreen.vcproj
index a223708bc..a71c77aee 100644
--- a/vc2005/fullscreen.vcproj
+++ b/vc2005/fullscreen.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="fullscreen"

 	ProjectGUID="{2147B9FD-7D65-4854-9770-D7B8767DB9AE}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\fullscreen_/fullscreen.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\fullscreen_/fullscreen.pch"

+				AssemblerListingLocation=".\fullscreen_/"

+				ObjectFile=".\fullscreen_/"

+				ProgramDataBaseFileName=".\fullscreen_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib opengl32.lib glu32.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/fullscreend.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\fullscreen_/fullscreend.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/fullscreen.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/fullscreen.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib glu32.lib fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/fullscreen.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/fullscreen.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/gl_overlay.vcproj b/vc2005/gl_overlay.vcproj
index bc7f5fabb..f9828fc5d 100644
--- a/vc2005/gl_overlay.vcproj
+++ b/vc2005/gl_overlay.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="gl_overlay"

 	ProjectGUID="{8D8D210D-F628-48BB-9127-D8003DF22018}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\gl_overlay_/gl_overlay.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\gl_overlay_/gl_overlay.pch"

+				AssemblerListingLocation=".\gl_overlay_/"

+				ObjectFile=".\gl_overlay_/"

+				ProgramDataBaseFileName=".\gl_overlay_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"

+				OutputFile="../test/gl_overlayd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\gl_overlay_/gl_overlayd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/gl_overlay.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/gl_overlay.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="../test/gl_overlay.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/gl_overlay.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/glpuzzle.vcproj b/vc2005/glpuzzle.vcproj
index 1bdfdecc1..b3882b7bc 100644
--- a/vc2005/glpuzzle.vcproj
+++ b/vc2005/glpuzzle.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="glpuzzle"

 	ProjectGUID="{BFE8CC78-6B58-4305-A096-796A3088BB26}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\glpuzzle_/glpuzzle.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\glpuzzle_/glpuzzle.pch"

+				AssemblerListingLocation=".\glpuzzle_/"

+				ObjectFile=".\glpuzzle_/"

+				ProgramDataBaseFileName=".\glpuzzle_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib comctl32.lib"

+				OutputFile="../test/glpuzzled.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\glpuzzle_/glpuzzled.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/glpuzzle.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/glpuzzle.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib cairo.lib"

+				OutputFile="../test/glpuzzle.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/glpuzzle.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/hello.vcproj b/vc2005/hello.vcproj
index 7ee7f874b..898aff207 100644
--- a/vc2005/hello.vcproj
+++ b/vc2005/hello.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="hello"

 	ProjectGUID="{ADA2462A-3656-41D2-B8A8-8D942AA0F8E9}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\hello_/hello.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\hello_/hello.pch"

+				AssemblerListingLocation=".\hello_/"

+				ObjectFile=".\hello_/"

+				ProgramDataBaseFileName=".\hello_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/hellod.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\hello_/hellod.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/hello.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/hello.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/hello.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/hello.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/help.vcproj b/vc2005/help.vcproj
index a45bdce45..2ccc2c66b 100644
--- a/vc2005/help.vcproj
+++ b/vc2005/help.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="help"

 	ProjectGUID="{9F3F86DA-3CC5-481F-8201-166933B5C8FF}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\help_/help.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\help_/help.pch"

+				AssemblerListingLocation=".\help_/"

+				ObjectFile=".\help_/"

+				ProgramDataBaseFileName=".\help_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib comctl32.lib"

+				OutputFile="../test/helpd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmtd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\help_/helpd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/help.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/help.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../test/help.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmt"

+				ProgramDatabaseFile=".\Release/help.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/iconize.vcproj b/vc2005/iconize.vcproj
index 038b532db..aa813f21e 100644
--- a/vc2005/iconize.vcproj
+++ b/vc2005/iconize.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="iconize"

 	ProjectGUID="{37C32832-DCE4-4BAA-9306-826064B30CCB}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\iconize_/iconize.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\iconize_/iconize.pch"

+				AssemblerListingLocation=".\iconize_/"

+				ObjectFile=".\iconize_/"

+				ProgramDataBaseFileName=".\iconize_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/iconized.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\iconize_/iconized.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/iconize.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/iconize.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/iconize.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/iconize.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/image.vcproj b/vc2005/image.vcproj
index 6535b5b68..f5f00d4cf 100644
--- a/vc2005/image.vcproj
+++ b/vc2005/image.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="image"

 	ProjectGUID="{3322F289-B025-4DB1-A7D1-FBA3840F8A0B}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\image_/image.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\image_/image.pch"

+				AssemblerListingLocation=".\image_/"

+				ObjectFile=".\image_/"

+				ProgramDataBaseFileName=".\image_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/imaged.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\image_/imaged.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/image.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/image.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/image.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/image.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/inactive.vcproj b/vc2005/inactive.vcproj
index 021c03c2f..ab1acabed 100644
--- a/vc2005/inactive.vcproj
+++ b/vc2005/inactive.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="inactive"

 	ProjectGUID="{B5271094-DE51-4E60-B4FA-D8F0BDB969FE}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\inactive_/inactive.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\inactive_/inactive.pch"

+				AssemblerListingLocation=".\inactive_/"

+				ObjectFile=".\inactive_/"

+				ProgramDataBaseFileName=".\inactive_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/inactived.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\inactive_/inactived.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/inactive.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/inactive.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/inactive.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/inactive.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\inactive.fl"

@@ -251,6 +458,26 @@
 					Outputs="..\test\inactive.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\inactive.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\inactive.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/input.vcproj b/vc2005/input.vcproj
index 42af72f55..e259922cd 100644
--- a/vc2005/input.vcproj
+++ b/vc2005/input.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="input"

 	ProjectGUID="{1C1B5A00-5F5D-4290-A07B-8A5A4A78570A}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\input_/input.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\input_/input.pch"

+				AssemblerListingLocation=".\input_/"

+				ObjectFile=".\input_/"

+				ProgramDataBaseFileName=".\input_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/inputd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\input_/inputd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/input.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/input.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/input.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/input.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/input_choice.vcproj b/vc2005/input_choice.vcproj
index 69de34c4e..9e8ce45b9 100644
--- a/vc2005/input_choice.vcproj
+++ b/vc2005/input_choice.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="input_choice"

 	ProjectGUID="{50651D04-C8F7-4C2B-B412-0848573BDF88}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\input_choice_/input_choice.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\input_choice_/input_choice.pch"

+				AssemblerListingLocation=".\input_choice_/"

+				ObjectFile=".\input_choice_/"

+				ProgramDataBaseFileName=".\input_choice_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/input_choiced.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\input_choice_/input_choiced.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/input_choice.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/input_choice.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/input_choice.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/input_choice.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/jpeg.vcproj b/vc2005/jpeg.vcproj
index 29a4b66a9..9ee8a9b8e 100644
--- a/vc2005/jpeg.vcproj
+++ b/vc2005/jpeg.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="jpeg"

 	ProjectGUID="{08B82852-90B3-4767-A5D2-F0A4FCCB2377}"

 	>

@@ -155,6 +155,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/jpeg.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkjpegd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/jpeg.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkjpeg.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -182,6 +324,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcapistd.c"

@@ -206,6 +368,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jccoefct.c"

@@ -230,6 +412,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jccolor.c"

@@ -254,6 +456,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcdctmgr.c"

@@ -278,6 +500,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jchuff.c"

@@ -302,6 +544,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcinit.c"

@@ -326,6 +588,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcmainct.c"

@@ -350,6 +632,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcmarker.c"

@@ -374,6 +676,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcmaster.c"

@@ -398,6 +720,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcomapi.c"

@@ -422,6 +764,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcparam.c"

@@ -446,6 +808,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcphuff.c"

@@ -470,6 +852,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcprepct.c"

@@ -494,6 +896,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jcsample.c"

@@ -518,6 +940,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jctrans.c"

@@ -542,6 +984,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdapimin.c"

@@ -566,6 +1028,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdapistd.c"

@@ -590,6 +1072,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdatadst.c"

@@ -614,6 +1116,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdatasrc.c"

@@ -638,6 +1160,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdcoefct.c"

@@ -662,6 +1204,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdcolor.c"

@@ -686,6 +1248,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jddctmgr.c"

@@ -710,6 +1292,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdhuff.c"

@@ -734,6 +1336,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdinput.c"

@@ -758,6 +1380,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdmainct.c"

@@ -782,6 +1424,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdmarker.c"

@@ -806,6 +1468,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdmaster.c"

@@ -830,6 +1512,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdmerge.c"

@@ -854,6 +1556,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdphuff.c"

@@ -878,6 +1600,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdpostct.c"

@@ -902,6 +1644,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdsample.c"

@@ -926,6 +1688,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jdtrans.c"

@@ -950,6 +1732,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jerror.c"

@@ -974,6 +1776,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jfdctflt.c"

@@ -998,6 +1820,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jfdctfst.c"

@@ -1022,6 +1864,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jfdctint.c"

@@ -1046,6 +1908,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jidctflt.c"

@@ -1070,6 +1952,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jidctfst.c"

@@ -1094,6 +1996,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jidctint.c"

@@ -1118,6 +2040,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jidctred.c"

@@ -1142,6 +2084,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jmemmgr.c"

@@ -1166,6 +2128,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jmemnobs.c"

@@ -1192,6 +2174,28 @@
 					RuntimeLibrary="2"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					RuntimeLibrary="3"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+					RuntimeLibrary="2"

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jquant1.c"

@@ -1216,6 +2220,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jquant2.c"

@@ -1240,6 +2264,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\jpeg\jutils.c"

@@ -1264,6 +2308,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/keyboard.vcproj b/vc2005/keyboard.vcproj
index 2f55c9eb8..70fa5d455 100644
--- a/vc2005/keyboard.vcproj
+++ b/vc2005/keyboard.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="keyboard"

 	ProjectGUID="{4DFA9F84-0457-4FE4-8008-283270610487}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\keyboard_/keyboard.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\keyboard_/keyboard.pch"

+				AssemblerListingLocation=".\keyboard_/"

+				ObjectFile=".\keyboard_/"

+				ProgramDataBaseFileName=".\keyboard_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/keyboardd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\keyboard_/keyboardd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/keyboard.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/keyboard.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/keyboard.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/keyboard.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\keyboard_ui.cxx"

@@ -250,6 +457,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\keyboard_ui.fl"

@@ -274,6 +500,26 @@
 					Outputs="..\test\keyboard_ui.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\keyboard_ui.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\keyboard_ui.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/label.vcproj b/vc2005/label.vcproj
index 3ff4e3cfd..6d39bf34b 100644
--- a/vc2005/label.vcproj
+++ b/vc2005/label.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="label"

 	ProjectGUID="{C3E7B77C-EED2-4046-9A30-9446C6F096A0}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\label_/label.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\label_/label.pch"

+				AssemblerListingLocation=".\label_/"

+				ObjectFile=".\label_/"

+				ProgramDataBaseFileName=".\label_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/labeld.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\label_/labeld.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/label.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/label.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/label.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/label.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/libpng.vcproj b/vc2005/libpng.vcproj
index 411863de3..df1ef965f 100644
--- a/vc2005/libpng.vcproj
+++ b/vc2005/libpng.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="libpng"

 	ProjectGUID="{D640A221-F95A-40FF-AC0E-0E8B615C7681}"

 	>

@@ -155,6 +155,148 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/libpng.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkpngd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/libpng.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkpng.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -182,6 +324,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngerror.c"

@@ -206,6 +368,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngget.c"

@@ -230,6 +412,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngmem.c"

@@ -254,6 +456,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngpread.c"

@@ -278,6 +500,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngread.c"

@@ -302,6 +544,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngrio.c"

@@ -326,6 +588,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngrtran.c"

@@ -350,6 +632,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngrutil.c"

@@ -374,6 +676,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngset.c"

@@ -398,6 +720,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngtrans.c"

@@ -422,6 +764,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngwio.c"

@@ -446,6 +808,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngwrite.c"

@@ -470,6 +852,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngwtran.c"

@@ -494,6 +896,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\png\pngwutil.c"

@@ -518,6 +940,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/line_style.vcproj b/vc2005/line_style.vcproj
index 66c5d63c0..16bee051c 100644
--- a/vc2005/line_style.vcproj
+++ b/vc2005/line_style.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="line_style"

 	ProjectGUID="{8B25CCE0-0988-4999-AE65-5A5EE31BB44D}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\line_style_/line_style.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\line_style_/line_style.pch"

+				AssemblerListingLocation=".\line_style_/"

+				ObjectFile=".\line_style_/"

+				ProgramDataBaseFileName=".\line_style_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/line_styled.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\line_style_/line_styled.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/line_style.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/line_style.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/line_style.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/line_style.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/mandelbrot.vcproj b/vc2005/mandelbrot.vcproj
index 17e4d02cf..248247c53 100644
--- a/vc2005/mandelbrot.vcproj
+++ b/vc2005/mandelbrot.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="mandelbrot"

 	ProjectGUID="{7BBECC0F-9381-4BF2-87CA-3FD1DA93DEAF}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\mandelbrot_/mandelbrot.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\mandelbrot_/mandelbrot.pch"

+				AssemblerListingLocation=".\mandelbrot_/"

+				ObjectFile=".\mandelbrot_/"

+				ProgramDataBaseFileName=".\mandelbrot_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib glu32.lib opengl32.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/mandelbrotd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\mandelbrot_/mandelbrotd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/mandelbrot.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/mandelbrot.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glu32.lib opengl32.lib fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/mandelbrot.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/mandelbrot.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\mandelbrot_ui.cxx"

@@ -250,6 +457,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\mandelbrot_ui.fl"

@@ -274,6 +500,26 @@
 					Outputs="../test/mandelbrot_ui.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/mandelbrot_ui.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/mandelbrot_ui.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/menubar.vcproj b/vc2005/menubar.vcproj
index 3a5ffbd5f..b4aea08e5 100644
--- a/vc2005/menubar.vcproj
+++ b/vc2005/menubar.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="menubar"

 	ProjectGUID="{78079B1F-152B-4E83-87CB-364586AB3AAC}"

 	>

@@ -199,6 +199,192 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\menubar_/menubar.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\menubar_/menubar.pch"

+				AssemblerListingLocation=".\menubar_/"

+				ObjectFile=".\menubar_/"

+				ProgramDataBaseFileName=".\menubar_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/menubard.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\menubar_/menubard.pdb"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/menubar.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/menubar.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/menubar.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/menubar.pdb"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -225,6 +411,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/message.vcproj b/vc2005/message.vcproj
index 9c88839ac..ce178a8fc 100644
--- a/vc2005/message.vcproj
+++ b/vc2005/message.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="message"

 	ProjectGUID="{E1A8934E-CB8D-4F74-B78A-EC7952BC4CBE}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\message_/message.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\message_/message.pch"

+				AssemblerListingLocation=".\message_/"

+				ObjectFile=".\message_/"

+				ProgramDataBaseFileName=".\message_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/messaged.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\message_/messaged.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/message.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/message.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/message.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/message.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/minimum.vcproj b/vc2005/minimum.vcproj
index 666365d1a..0fb528c59 100644
--- a/vc2005/minimum.vcproj
+++ b/vc2005/minimum.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="minimum"

 	ProjectGUID="{F658ABE4-7FE1-4404-9B7C-55E0D660F1B3}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\minimum_/minimum.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\minimum_/minimum.pch"

+				AssemblerListingLocation=".\minimum_/"

+				ObjectFile=".\minimum_/"

+				ProgramDataBaseFileName=".\minimum_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/minimumd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\minimum_/minimumd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/minimum.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/minimum.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/minimum.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/minimum.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/navigation.vcproj b/vc2005/navigation.vcproj
index d69381ea7..6df4d43c4 100644
--- a/vc2005/navigation.vcproj
+++ b/vc2005/navigation.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="navigation"

 	ProjectGUID="{AA0ED6EA-2DA3-4486-AFBD-76CC9D206A1E}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\navigation_/navigation.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\navigation_/navigation.pch"

+				AssemblerListingLocation=".\navigation_/"

+				ObjectFile=".\navigation_/"

+				ProgramDataBaseFileName=".\navigation_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/navigationd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\navigation_/navigationd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/navigation.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/navigation.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/navigation.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/navigation.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/output.vcproj b/vc2005/output.vcproj
index d498ce726..e4a33d08b 100644
--- a/vc2005/output.vcproj
+++ b/vc2005/output.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="output"

 	ProjectGUID="{1CA77C94-5785-4B38-B91A-1EAFBD885BC2}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\output_/output.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\output_/output.pch"

+				AssemblerListingLocation=".\output_/"

+				ObjectFile=".\output_/"

+				ProgramDataBaseFileName=".\output_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/outputd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\output_/outputd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/output.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/output.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/output.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/output.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/overlay.vcproj b/vc2005/overlay.vcproj
index 332d7063c..4b319f9f3 100644
--- a/vc2005/overlay.vcproj
+++ b/vc2005/overlay.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="overlay"

 	ProjectGUID="{3B0BF144-5D75-4D4A-BF75-7347186C808F}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\overlay_/overlay.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\overlay_/overlay.pch"

+				AssemblerListingLocation=".\overlay_/"

+				ObjectFile=".\overlay_/"

+				ProgramDataBaseFileName=".\overlay_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/overlayd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\overlay_/overlayd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/overlay.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/overlay.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/overlay.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/overlay.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/pack.vcproj b/vc2005/pack.vcproj
index 6395ee532..4629e54a3 100644
--- a/vc2005/pack.vcproj
+++ b/vc2005/pack.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="pack"

 	ProjectGUID="{CEB7B88B-3AA5-4DD6-818F-CF19E12BF1E1}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\pack_/pack.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\pack_/pack.pch"

+				AssemblerListingLocation=".\pack_/"

+				ObjectFile=".\pack_/"

+				ProgramDataBaseFileName=".\pack_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/packd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\pack_/packd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/pack.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/pack.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/pack.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/pack.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/pixmap.vcproj b/vc2005/pixmap.vcproj
index 45a03a5df..a54ffb10f 100644
--- a/vc2005/pixmap.vcproj
+++ b/vc2005/pixmap.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="pixmap"

 	ProjectGUID="{1CD667DD-E7AE-4F36-A1F7-F41FB59786BE}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\pixmap_/pixmap.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\pixmap_/pixmap.pch"

+				AssemblerListingLocation=".\pixmap_/"

+				ObjectFile=".\pixmap_/"

+				ProgramDataBaseFileName=".\pixmap_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/pixmapd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\pixmap_/pixmapd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/pixmap.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/pixmap.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/pixmap.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/pixmap.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/pixmap_browser.vcproj b/vc2005/pixmap_browser.vcproj
index 74cb68901..0f0b0cd5e 100644
--- a/vc2005/pixmap_browser.vcproj
+++ b/vc2005/pixmap_browser.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="pixmap_browser"

 	ProjectGUID="{289C605C-94CC-437F-836B-2FE41528EEEC}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\pixmap_browser_/pixmap_browser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\pixmap_browser_/pixmap_browser.pch"

+				AssemblerListingLocation=".\pixmap_browser_/"

+				ObjectFile=".\pixmap_browser_/"

+				ProgramDataBaseFileName=".\pixmap_browser_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib comctl32.lib"

+				OutputFile="../test/pixmap_browserd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmtd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\pixmap_browser_/pixmap_browserd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/pixmap_browser.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/pixmap_browser.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="comctl32.lib cairo.lib"

+				OutputFile="../test/pixmap_browser.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcmt"

+				ProgramDatabaseFile=".\Release/pixmap_browser.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/preferences.vcproj b/vc2005/preferences.vcproj
index 89fdfe893..1e00f1ead 100644
--- a/vc2005/preferences.vcproj
+++ b/vc2005/preferences.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="preferences"

 	ProjectGUID="{D04E36D7-1C68-43E6-BE30-A7793CE3C799}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\preferences_/preferences.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\preferences_/preferences.pch"

+				AssemblerListingLocation=".\preferences_/"

+				ObjectFile=".\preferences_/"

+				ProgramDataBaseFileName=".\preferences_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/preferencesd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\preferences_/preferencesd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/preferences.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/preferences.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/preferences.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/preferences.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\preferences.fl"

@@ -251,6 +458,26 @@
 					Outputs="..\test\preferences.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\preferences.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="..\test\preferences.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/radio.vcproj b/vc2005/radio.vcproj
index 7026ee8eb..2d2e48a7c 100644
--- a/vc2005/radio.vcproj
+++ b/vc2005/radio.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="radio"

 	ProjectGUID="{AD5ACED4-F6EE-4AC0-B502-23CFD10EF603}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\radio_/radio.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\radio_/radio.pch"

+				AssemblerListingLocation=".\radio_/"

+				ObjectFile=".\radio_/"

+				ProgramDataBaseFileName=".\radio_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/radiod.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\radio_/radiod.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/radio.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/radio.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/radio.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/radio.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\radio.fl"

@@ -251,6 +458,26 @@
 					Outputs="../test/radio.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/radio.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/radio.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/resize.vcproj b/vc2005/resize.vcproj
index 26c3a341a..b1d8df769 100644
--- a/vc2005/resize.vcproj
+++ b/vc2005/resize.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="resize"

 	ProjectGUID="{46771042-C840-4314-BA3C-C5BC2FBD7CBB}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\resize_/resize.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\resize_/resize.pch"

+				AssemblerListingLocation=".\resize_/"

+				ObjectFile=".\resize_/"

+				ProgramDataBaseFileName=".\resize_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/resized.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\resize_/resized.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/resize.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/resize.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/resize.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/resize.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\resize.fl"

@@ -251,6 +458,26 @@
 					Outputs="../test/resize.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/resize.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/resize.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/resizebox.vcproj b/vc2005/resizebox.vcproj
index 4d7a513d1..b772e6b79 100644
--- a/vc2005/resizebox.vcproj
+++ b/vc2005/resizebox.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="resizebox"

 	ProjectGUID="{2E03AF33-56A1-4366-B016-184CD96F3B56}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\resizebox_/resizebox.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\resizebox_/resizebox.pch"

+				AssemblerListingLocation=".\resizebox_/"

+				ObjectFile=".\resizebox_/"

+				ProgramDataBaseFileName=".\resizebox_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/resizeboxd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\resizebox_/resizeboxd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/resizebox.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/resizebox.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/resizebox.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/resizebox.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/scroll.vcproj b/vc2005/scroll.vcproj
index d624d4a5b..638272615 100644
--- a/vc2005/scroll.vcproj
+++ b/vc2005/scroll.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="scroll"

 	ProjectGUID="{97541B63-87AA-4ACE-BBF5-175F8D1389EC}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\scroll_/scroll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\scroll_/scroll.pch"

+				AssemblerListingLocation=".\scroll_/"

+				ObjectFile=".\scroll_/"

+				ProgramDataBaseFileName=".\scroll_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/scrolld.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\scroll_/scrolld.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/scroll.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/scroll.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/scroll.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/scroll.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/shape.vcproj b/vc2005/shape.vcproj
index cfc68dd07..a0a2499ab 100644
--- a/vc2005/shape.vcproj
+++ b/vc2005/shape.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="shape"

 	ProjectGUID="{45797F58-624B-4FA0-A7A3-5956114D8215}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\shape_/shape.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\shape_/shape.pch"

+				AssemblerListingLocation=".\shape_/"

+				ObjectFile=".\shape_/"

+				ProgramDataBaseFileName=".\shape_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib opengl32.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/shaped.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\shape_/shaped.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/shape.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/shape.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="opengl32.lib fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/shape.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/shape.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/subwindow.vcproj b/vc2005/subwindow.vcproj
index 0e96a1247..db46bda1c 100644
--- a/vc2005/subwindow.vcproj
+++ b/vc2005/subwindow.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="subwindow"

 	ProjectGUID="{7A2467D2-B03A-4964-A289-EF233EB39F69}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\subwindow_/subwindow.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\subwindow_/subwindow.pch"

+				AssemblerListingLocation=".\subwindow_/"

+				ObjectFile=".\subwindow_/"

+				ProgramDataBaseFileName=".\subwindow_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/subwindowd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\subwindow_/subwindowd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/subwindow.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/subwindow.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/subwindow.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/subwindow.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/sudoku.vcproj b/vc2005/sudoku.vcproj
index 3451e76fd..bc95e1924 100644
--- a/vc2005/sudoku.vcproj
+++ b/vc2005/sudoku.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="sudoku"

 	ProjectGUID="{AE750416-51BA-485C-BD76-EF11B4536EE8}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\sudoku_/sudoku.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\sudoku_/sudoku.pch"

+				AssemblerListingLocation=".\sudoku_/"

+				ObjectFile=".\sudoku_/"

+				ProgramDataBaseFileName=".\sudoku_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib winmm.lib comctl32.lib"

+				OutputFile="../test/sudokud.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\sudoku_/sudokud.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/sudoku.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/sudoku.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib winmm.lib comctl32.lib cairo.lib"

+				OutputFile="../test/sudoku.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/sudoku.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\sudoku.rc"

diff --git a/vc2005/symbols.vcproj b/vc2005/symbols.vcproj
index a2d1ef76d..9ea10c7f9 100644
--- a/vc2005/symbols.vcproj
+++ b/vc2005/symbols.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="symbols"

 	ProjectGUID="{3E822491-B134-43B0-A40E-9348FFAB527F}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\symbols_/symbols.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\symbols_/symbols.pch"

+				AssemblerListingLocation=".\symbols_/"

+				ObjectFile=".\symbols_/"

+				ProgramDataBaseFileName=".\symbols_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/symbolsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\symbols_/symbolsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/symbols.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/symbols.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/symbols.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/symbols.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/tabs.vcproj b/vc2005/tabs.vcproj
index f76de5e35..610fad4b2 100644
--- a/vc2005/tabs.vcproj
+++ b/vc2005/tabs.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="tabs"

 	ProjectGUID="{AF932F77-1804-4DA4-A6DC-950795D6AFC1}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\tabs_/tabs.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\tabs_/tabs.pch"

+				AssemblerListingLocation=".\tabs_/"

+				ObjectFile=".\tabs_/"

+				ProgramDataBaseFileName=".\tabs_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/tabsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\tabs_/tabsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/tabs.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/tabs.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/tabs.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/tabs.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\tabs.fl"

@@ -251,6 +458,26 @@
 					Outputs="../test/tabs.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/tabs.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/tabs.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/threads.vcproj b/vc2005/threads.vcproj
index 9060cddeb..84a50dcc9 100644
--- a/vc2005/threads.vcproj
+++ b/vc2005/threads.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="threads"

 	ProjectGUID="{45236F71-7031-40BC-ADCD-0535A64C04B0}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\threads_/threads.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\threads_/threads.pch"

+				AssemblerListingLocation=".\threads_/"

+				ObjectFile=".\threads_/"

+				ProgramDataBaseFileName=".\threads_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/threadsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\threads_/threadsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/threads.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/threads.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/threads.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/threads.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/tile.vcproj b/vc2005/tile.vcproj
index 18c86aafe..05112f5ae 100644
--- a/vc2005/tile.vcproj
+++ b/vc2005/tile.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="tile"

 	ProjectGUID="{28D24031-1A17-497A-B926-59CF78076DED}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\tile_/tile.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\tile_/tile.pch"

+				AssemblerListingLocation=".\tile_/"

+				ObjectFile=".\tile_/"

+				ProgramDataBaseFileName=".\tile_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/tiled.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\tile_/tiled.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/tile.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/tile.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/tile.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/tile.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/tiled_image.vcproj b/vc2005/tiled_image.vcproj
index 2c88c8aac..aacaed4ec 100644
--- a/vc2005/tiled_image.vcproj
+++ b/vc2005/tiled_image.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="tiled_image"

 	ProjectGUID="{23F17042-704E-4198-8017-A8584E884CF7}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\tiled_image_/tiled_image.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\tiled_image_/tiled_image.pch"

+				AssemblerListingLocation=".\tiled_image_/"

+				ObjectFile=".\tiled_image_/"

+				ProgramDataBaseFileName=".\tiled_image_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/tiled_imaged.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\tiled_image_/tiled_imaged.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/tiled_image.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/tiled_image.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/tiled_image.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/tiled_image.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/utf8.vcproj b/vc2005/utf8.vcproj
index 8cd2ed1a6..b4095905e 100644
--- a/vc2005/utf8.vcproj
+++ b/vc2005/utf8.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="utf8"

 	ProjectGUID="{ADA2462A-3656-41D2-B7A8-8D942AA0F8F9}"

 	RootNamespace="utf8"

@@ -202,6 +202,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\utf8_/utf8.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\utf8_/utf8.pch"

+				AssemblerListingLocation=".\utf8_/"

+				ObjectFile=".\utf8_/"

+				ProgramDataBaseFileName=".\utf8_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib imm32.lib"

+				OutputFile="../test/utf8d.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\utf8_/utf8d.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/utf8.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/utf8.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib imm32.lib cairo.lib"

+				OutputFile="../test/utf8.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/utf8.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -228,6 +416,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/valuators.vcproj b/vc2005/valuators.vcproj
index ffa700df4..7256cc6ed 100644
--- a/vc2005/valuators.vcproj
+++ b/vc2005/valuators.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="valuators"

 	ProjectGUID="{CEE12ACB-20E4-45E4-AD5E-D15D7CFF68C3}"

 	>

@@ -201,6 +201,194 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\valuators_/valuators.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\valuators_/valuators.pch"

+				AssemblerListingLocation=".\valuators_/"

+				ObjectFile=".\valuators_/"

+				ProgramDataBaseFileName=".\valuators_/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"

+				OutputFile="../test/valuatorsd.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\valuators_/valuatorsd.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/valuators.tlb"

+				HeaderFileName=""

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/valuators.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="fltk.lib comctl32.lib cairo.lib"

+				OutputFile="../test/valuators.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories="..\lib"

+				IgnoreDefaultLibraryNames="libcd"

+				ProgramDatabaseFile=".\Release/valuators.pdb"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -227,6 +415,25 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\test\valuators.fl"

@@ -251,6 +458,26 @@
 					Outputs="../test/valuators.cxx"

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluidd"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/valuators.cxx"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCustomBuildTool"

+					Description="Create .cxx and .h file with fluid"

+					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"

+					Outputs="../test/valuators.cxx"

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>

diff --git a/vc2005/zlib.vcproj b/vc2005/zlib.vcproj
index a2965549e..51315253e 100644
--- a/vc2005/zlib.vcproj
+++ b/vc2005/zlib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="zlib"

 	ProjectGUID="{E1D9CE3F-400D-40E8-AD0D-61C29B1847FF}"

 	>

@@ -154,6 +154,147 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration

+			Name="Debug Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="HAVE_CAIRO=1"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/zlib.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkzd.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Cairo|Win32"

+			OutputDirectory="$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="4"

+				InlineFunctionExpansion="2"

+				FavorSizeOrSpeed="0"

+				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/zlib.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\lib\fltkz.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

 	</Configurations>

 	<References>

 	</References>

@@ -181,6 +322,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\compress.c"

@@ -205,6 +366,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\crc32.c"

@@ -229,6 +410,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\deflate.c"

@@ -253,6 +454,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\gzio.c"

@@ -277,6 +498,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\inffast.c"

@@ -301,6 +542,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\inflate.c"

@@ -325,6 +586,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\inftrees.c"

@@ -349,6 +630,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\trees.c"

@@ -373,6 +674,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\uncompr.c"

@@ -397,6 +718,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 		<File

 			RelativePath="..\zlib\zutil.c"

@@ -421,6 +762,26 @@
 					PreprocessorDefinitions=""

 				/>

 			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					Optimization="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release Cairo|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					FavorSizeOrSpeed="0"

+					AdditionalIncludeDirectories=""

+					PreprocessorDefinitions=""

+				/>

+			</FileConfiguration>

 		</File>

 	</Files>

 	<Globals>