From: jake <jake@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Fri, 5 Apr 2002 23:51:21 +0000 (+0000)
Subject: Updated/added MVSC++ 6.0 project files for compilation of
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3a4825306f808c36fb2c529f27c5457a0715dfaf;p=rrdtool.git

Updated/added MVSC++ 6.0 project files for compilation of
rrd.lib and rrdtool.exe on Win32. Changes for RRDs compilation
on Win32. Moved src/ntconfig.h to confignt/config.h.


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@115 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/NT-BUILD-TIPS.txt b/NT-BUILD-TIPS.txt
index 882ee95..0354f50 100644
--- a/NT-BUILD-TIPS.txt
+++ b/NT-BUILD-TIPS.txt
@@ -1,3 +1,33 @@
+Compiling RRDtool 1.1.x on Win32 (WinXP/Win2K with Visual C++):
+---------------------------------------------------------------
+4/1/02 Jake Brutlag (jakeb@corp.webtv.net)
+
+These notes share some insight I gained compiling 1.1.x with
+MS Visual C++ 6.0 (using project files). This information may or
+may not be accurate at the time you are reading this.
+
+(1) freetype and rrdtool cannot use precompiled headers (which are
+enabled by default for MSVC++ projects).  MSVC++ 6.0 does not
+support precompiled headers if #include directives contain MACROS.
+(2) Compile Release build with Default optimization, not the
+Maximize Speed optimization. I encountered some strange errors
+(related to argument processing for complex commands like graph--
+perhaps the getopt stuff is too blame) with Maximize Speed.
+(3) libart relies upon config.h (ostensibly generated by the
+configure script-- but of course not on Win32 platforms). ..\..\confignt
+(which contains a static Win32 version of config.h) should be on
+the include path.
+(4) Fonts are located in the %windir%\fonts, so the default font
+is c:\winnt\fonts\cour.ttf.
+
+Currently, to compile rrd.lib and rrdtool.exe using
+the MSVC++ project files, first start MSVC++ 6.0. Open the rrdtool
+workspace (rrdtool.dsw in the src directory). The active project/
+configuration should be rrdtool-Win32 Release. Select Rebuild All
+from the Build menu. The static link library (rrd.lib) will
+be generated in src\release directory and executable will be generated
+in the src\toolrelease directory.
+
 Compiling RRDtool on NT ... work in progress
 ---------------------------------------------------------------
                          by Tamas Kovacshazy (khazy@mit.bme.hu)
diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
index d567d07..17b3d85 100644
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -11,10 +11,10 @@ extern "C" {
 }
 #endif
 
-#include "../src/rrd_tool.h"
+#include "../../src/rrd_tool.h"
 
 /* perl 5.004 compatibility */
-#if PERLPATCHLEVEL < 5
+#if PERLPATCHLEVEL < 5 
 #define PL_sv_undef sv_undef
 #endif
 
@@ -39,12 +39,14 @@ extern "C" {
 		\
 		if (rrd_test_error()) XSRETURN_UNDEF;
 
-
+/*
+ * should not be needed if libc is linked (see ntmake.pl)
 #ifdef WIN32
  #define free free
  #define malloc malloc
  #define realloc realloc
-#endif /*WIN32*/
+#endif
+*/
 
 
 MODULE = RRDs	PACKAGE = RRDs	PREFIX = rrd_
diff --git a/bindings/perl-shared/ntmake.pl b/bindings/perl-shared/ntmake.pl
index b510d76..ff01a41 100644
--- a/bindings/perl-shared/ntmake.pl
+++ b/bindings/perl-shared/ntmake.pl
@@ -1,14 +1,22 @@
 use ExtUtils::MakeMaker;
+use Config;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
+# This file is current set to compile with ActiveState 5xx builds
+# (perl 5.005_03). Hopefully this lowest common denominator
+# approach will work with newer ActiveState builds (i.e. 6xx).
 WriteMakefile(
     'NAME'	=> 'RRDs',
-    'VERSION_FROM' => 'RRDs.pm', 
-    #'DEFINE'	=> '-D_DEBUG -DWIN32 -D_CONSOLE',     
-    'OPTIMIZE' => '-O2',
-    'INC'	=> '-I../src/ -I../gd1.3',    
-    #'LIBS' => ['-L../src/debug -lrrd.lib  -L../gd1.3/debug -lgd.lib'],
-	#'LIBC' => 'libc.lib',
-    'MYEXTLIB'  => '../src/release/rrd.lib ../gd1.3/release/gd.lib ..\zlib-1.1.3\Release\zlib.lib ..\libpng-1.0.3\Release\png.lib', 
-    'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
+    'VERSION_FROM' => 'RRDs.pm',
+    'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+   'INC'	=> '-I../../src/ -I../../libraries/freetype-2.0.5/include -I ../../libraries/libart_lgpl-2.3.7 -I ../../libraries/zlib-1.1.4 -I ../../libraries/libpng-1.2.0',    
+# change this path to refer to your libc.lib
+    'MYEXTLIB'  => 'c:/vc98/lib/libc.lib ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0\release\png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
+    'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' },
+    ($] ge '5.005') ? (
+        'AUTHOR' => 'Tobias Oetiker (oetiker@ee.ethz.ch)',
+        'ABSTRACT' => 'Round Robin Database Tool',
+    ) : ()
+
+
 );
diff --git a/confignt/config.h b/confignt/config.h
new file mode 100644
index 0000000..261f0e6
--- /dev/null
+++ b/confignt/config.h
@@ -0,0 +1,13 @@
+/* config.h.nt: what configure _would_ say, if it ran on NT */
+
+#define STDC_HEADERS 1
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME 1
+
+/* Define if you have the <math.h> header file.  */
+#define HAVE_MATH_H 1
+
+#define rrd_realloc(a,b) realloc((a), (b))
+
+#define snprintf _snprintf
diff --git a/libraries/freetype-2.0.5/freetype.dsp b/libraries/freetype-2.0.5/freetype.dsp
new file mode 100644
index 0000000..50ad9f7
--- /dev/null
+++ b/libraries/freetype-2.0.5/freetype.dsp
@@ -0,0 +1,322 @@
+# Microsoft Developer Studio Project File - Name="freetype" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=freetype - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "freetype.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "freetype.mak" CFG="freetype - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "freetype - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "freetype - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "freetype - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /I "include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /O<none> /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /I "include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "freetype - Win32 Release"
+# Name "freetype - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ahangles.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ahglobal.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ahglyph.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ahhint.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ahmodule.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cff.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cidgload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cidload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cidobjs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cidparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cidriver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcalc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcchunk.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcglyph.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcimage.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcmanag.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftcsbits.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftextend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftglyph.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftgrays.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftlru.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftnames.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftobjs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftoutln.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftraster.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftrend1.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftsmooth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftstream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftsystem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fttrigon.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcfdriver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcfread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pcfutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\psauxmod.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\psmodule.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\psobjs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sfdriver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sfobjs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1afm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1decode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1driver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1gload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1load.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1objs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\t1parse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttcmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttdriver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttgload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttinterp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttobjs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttpload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttpost.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ttsbit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\winfnt.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/libraries/libart_lgpl-2.3.7/libart.dsp b/libraries/libart_lgpl-2.3.7/libart.dsp
new file mode 100644
index 0000000..2ba7fb3
--- /dev/null
+++ b/libraries/libart_lgpl-2.3.7/libart.dsp
@@ -0,0 +1,249 @@
+# Microsoft Developer Studio Project File - Name="libart" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libart - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libart.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libart.mak" CFG="libart - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libart - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libart - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libart - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /I "..\..\confignt" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "LIBART_COMPILATION" /YX /FD /c
+# SUBTRACT CPP /O<none>
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libart - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /I "..\..\confignt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "LIBART_COMPILATION" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libart - Win32 Release"
+# Name "libart - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\art_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_alphagamma.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_bpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_gray_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_pixbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rect.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rect_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rect_uta.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_render.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_render_gradient.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_render_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_a_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_affine_private.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_bitmap_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_pixbuf_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_rgba_affine.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgb_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_rgba.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_intersect.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_ops.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_point.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_render_aa.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_vpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_vpath_stroke.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_svp_wind.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_uta.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_uta_ops.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_uta_rect.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_uta_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_uta_vpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_vpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_vpath_bpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_vpath_dash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\art_vpath_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\libart-features.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/libraries/libpng-1.2.0/png.dsp b/libraries/libpng-1.2.0/png.dsp
new file mode 100644
index 0000000..7a8ebd5
--- /dev/null
+++ b/libraries/libpng-1.2.0/png.dsp
@@ -0,0 +1,183 @@
+# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=png - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "png.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "png.mak" CFG="png - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "png - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "png - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# SUBTRACT CPP /O<none>
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "png - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "png - Win32 Release"
+# Name "png - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\png.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngerror.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngget.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngmem.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngpread.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngread.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrio.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrtran.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrutil.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngset.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngtrans.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwio.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwrite.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwtran.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwutil.c
+# ADD CPP /I "..\zlib-1.1.4"
+# SUBTRACT CPP /I "..\zlib-1.1.3"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/libraries/zlib-1.1.4/zlib.dsp b/libraries/zlib-1.1.4/zlib.dsp
new file mode 100644
index 0000000..c443829
--- /dev/null
+++ b/libraries/zlib-1.1.4/zlib.dsp
@@ -0,0 +1,149 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# SUBTRACT CPP /O<none>
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/src/ntconfig.h b/src/ntconfig.h
deleted file mode 100644
index 78fde7a..0000000
--- a/src/ntconfig.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* config.h.nt: what configure _would_ say, if it ran on NT */
-
-#define STDC_HEADERS 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the <math.h> header file.  */
-#define HAVE_MATH_H 1
-
-#define rrd_realloc(a,b) realloc((a), (b))
diff --git a/src/rrd.dsp b/src/rrd.dsp
index c6bfe1c..afb073d 100644
--- a/src/rrd.dsp
+++ b/src/rrd.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
-# SUBTRACT CPP /X /YX
+# ADD CPP /nologo /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# SUBTRACT CPP /O<none> /X /YX
 # ADD BASE RSC /l 0x100c
 # ADD RSC /l 0x100c
 BSC32=bscmake.exe
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
 # SUBTRACT CPP /X /YX
 # ADD BASE RSC /l 0x100c
 # ADD RSC /l 0x100c
@@ -84,10 +84,6 @@ LIB32=link.exe -lib
 # Name "rrd - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\gdpng.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\getopt.c
 # End Source File
 # Begin Source File
@@ -96,7 +92,7 @@ SOURCE=.\getopt1.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\gifsize.c
+SOURCE=.\hash_32.c
 # End Source File
 # Begin Source File
 
@@ -132,10 +128,26 @@ SOURCE=.\rrd_format.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rrd_gfx.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rrd_graph.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rrd_graph_helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rrd_hw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rrd_info.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rrd_last.c
 # End Source File
 # Begin Source File
@@ -152,6 +164,10 @@ SOURCE=.\rrd_restore.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rrd_rpncalc.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rrd_tune.c
 # End Source File
 # Begin Source File
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 7ca6450..bd84706 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -11,11 +11,10 @@
 #else
 # define DPRINT(x)
 #endif
-
+#include "rrd_tool.h"
 #include <png.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <math.h>
 
 #include "rrd_gfx.h"
 
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 537a03f..bfce36f 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -12,6 +12,7 @@
 #ifdef WIN32
 #include <io.h>
 #include <fcntl.h>
+#define RRD_DEFAULT_FONT "c:/winnt/fonts/COUR.TTF"
 #endif
 
 #include "rrd_graph.h"
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 426cef8..76bd7a7 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -12,7 +12,7 @@ extern "C" {
 #define _RRD_TOOL_H
 
 #ifdef WIN32
-# include "ntconfig.h"
+#include "../confignt/config.h"
 #else
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/rrdtool.dsp b/src/rrdtool.dsp
index ad9d877..d3bb360 100644
--- a/src/rrdtool.dsp
+++ b/src/rrdtool.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# SUBTRACT CPP /O<none> /YX
 # ADD BASE RSC /l 0x100c /d "NDEBUG"
 # ADD RSC /l 0x100c /d "NDEBUG"
 BSC32=bscmake.exe
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\release\gd.lib release\rrd.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\release\png.lib ..\libraries\zlib-1.1.4\release\zlib.lib ..\libraries\libart_lgpl-2.3.7\release\libart.lib ..\libraries\freetype-2.0.5\release\freetype.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386
 
 !ELSEIF  "$(CFG)" == "rrdtool - Win32 Debug"
 
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /ML /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "_DEBUG"
 # ADD RSC /l 0x100c /d "_DEBUG"
@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"rrdtool.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\debug\gd.lib debug\rrd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\Debug\png.lib ..\libraries\zlib-1.1.4\Debug\zlib.lib ..\libraries\libart_lgpl-2.3.7\Debug\libart.lib ..\libraries\freetype-2.0.5\Debug\freetype.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
diff --git a/src/rrdtool.dsw b/src/rrdtool.dsw
index c1f7755..a8ad5a6 100644
--- a/src/rrdtool.dsw
+++ b/src/rrdtool.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "cgilib"="..\cgilib-0.4\cgilib.dsp" - Package Owner=<4>
+Project: "cgilib"="..\libraries\cgilib-0.4\cgilib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,19 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gd"="..\gd1.3\gd.dsp" - Package Owner=<4>
+Project: "freetype"="..\libraries\freetype-2.0.5\freetype.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libart"="..\libraries\libart_lgpl-2.3.7\libart.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -23,14 +35,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name png
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "png"="..\libpng-1.0.3\png.dsp" - Package Owner=<4>
+Project: "png"="..\libraries\libpng-1.2.0\png.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -53,9 +62,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name gd
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -89,11 +95,23 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name rrd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name freetype
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libart
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name png
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "zlib"="..\zlib-1.1.3\zlib.dsp" - Package Owner=<4>
+Project: "zlib"="..\libraries\zlib-1.1.4\zlib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{