![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 641410d)
raw | patch | inline | side by side (parent: 641410d)
| author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Thu, 15 Dec 2011 16:07:05 +0000 (16:07 +0000) | ||
| committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Thu, 15 Dec 2011 16:07:05 +0000 (16:07 +0000) |
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2235 a5681a0c-68f1-0310-ab6d-d61299d08faa
26 files changed:
index 0f30b7eb29a8e2d0466e722785b8148e0740da19..85ce94567d381e7641f70803c0c04b620b81ce33 100644 (file)
-ntmake-build
MANIFEST
README
Makefile.PL
index 625dae5983d3778b66a43262bc438a70921e4320..781682ca5cc71729c14d29f9e4a3f67f8e4693b5 100644 (file)
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
-# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
-# path to librrd.so then the Makefile will be written such that RRDs.so knows
-# where to find librrd.so later on ...
-my $R="";
-if ($ARGV[-1] =~ /RPATH=(\S+)/){
- pop @ARGV;
- my $rp = $1;
- for ($^O){
- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
- /hpux/ && do{ $R = "+b$rp"};
- /solaris/ && do{ $R = "-R$rp"};
- /bsd/ && do{ $R = "-R$rp"};
- /aix/ && do{ $R = "-blibpath:$rp"};
+if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
+ WriteMakefile(
+ 'NAME' => 'RRDs',
+ 'VERSION_FROM' => 'RRDs.pm',
+ 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL} -D_CRT_SECURE_NO_WARNINGS -DWIN32",
+ 'INC' => '-I../../src/ "-IC:/Perl/lib/CORE" -I"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include" -I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"',
+ 'LDDLFLAGS' => '-dll -nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
+ 'LDFLAGS' => '-nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86',
+ 'OPTIMIZE' => '-O2 -MD',
+ 'LIBS' => '"..\..\win32\Release\rrdlib.lib" "..\..\win32\Release" "C:\Perl\lib\CORE\perl514.lib" -L../../contrib/lib -L"C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib" -L"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib" -L"C:\Perl\lib\CORE"',
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
+ ($] ge '5.005') ? (
+ 'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
+ 'ABSTRACT' => 'Round Robin Database Tool',
+ ) : ()
+ );
+}else{
+ # if the last argument when calling Makefile.PL is RPATH=/... and ... is the
+ # path to librrd.so then the Makefile will be written such that RRDs.so knows
+ # where to find librrd.so later on ...
+ my $R="";
+ if ($ARGV[-1] =~ /RPATH=(\S+)/){
+ pop @ARGV;
+ my $rp = $1;
+ for ($^O){
+ /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
+ /hpux/ && do{ $R = "+b$rp"};
+ /solaris/ && do{ $R = "-R$rp"};
+ /bsd/ && do{ $R = "-R$rp"};
+ /aix/ && do{ $R = "-blibpath:$rp"};
+ }
}
-}
-
-# darwin works without this because librrd contains its
-# install_name which will includes the final location of the
-# library after it is installed. This install_name gets transfered
-# to the perl shared object.
-my $librrd;
-if ($^O eq 'darwin'){
+ # darwin works without this because librrd contains its
+ # install_name which will includes the final location of the
+ # library after it is installed. This install_name gets transfered
+ # to the perl shared object.
+ my $librrd;
+ if ($^O eq 'darwin'){
$librrd = '-lrrd';
-}
-else {
- $librrd = "-L../../src/.libs/ $R -lrrd";
-}
+ } else {
+ $librrd = "-L../../src/.libs/ $R -lrrd";
+ }
-WriteMakefile(
- 'NAME' => 'RRDs',
- 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I../../src',
- # Perl will figure out which one is valid
- #'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
- 'depend' => {'RRDs.c' => "../../src/librrd.la"},
- 'LDFROM' => '$(OBJECT) '.$librrd,
- 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
- ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
-);
+ WriteMakefile(
+ 'NAME' => 'RRDs',
+ 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+ 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+ 'INC' => '-I../../src',
+ # Perl will figure out which one is valid
+ #'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
+ 'depend' => {'RRDs.c' => "../../src/librrd.la"},
+ 'LDFROM' => '$(OBJECT) '.$librrd,
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
+ ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
+ );
+}
index 0918ecf010cb6510bacdb3b4bd9aee1ee878abe6..c5d7fbf55c09d912bbeb5c508ceb884523b5e6bf 100644 (file)
perl Makefile.PL
make test
-(win32 users try perl ntmake.pl)
+For Windows Users, make sure you have the following requirements:
-* if dynamic linking does not work, try
+- ActiveState Perl (32bit version Only)
+- Microsoft Visual C++
+- The following binaries in your path: mt.exe, nmake.exe, link.exe, perl.exe
+- Make the project rrdlib.vcproj in Release mode to create rrdlib.lib
-perl Makefile.PL LINKTYPE=static
-make test
+To build:
+
+perl Makefile.PL
+nmake
+
+To Install:
+
+nmake install
+
+NOTE: If using anything other than Visual C++ 9, edit Makefile.PL and modify
+ your paths appropriately.
index 029b3beeebe0a3de3190e29d5e0f8419ac6c7ad3..7c75f027dfe9ab65978648637e129dce0cce7752 100644 (file)
*/
#define VERSION_SAVED VERSION
#undef VERSION
+#ifndef WIN32
#include "../../rrd_config.h"
+#endif
#include "../../src/rrd_tool.h"
#undef VERSION
#define VERSION VERSION_SAVED
#undef VERSION_SAVED
/* perl 5.004 compatibility */
-#if PERLPATCHLEVEL < 5
+#ifndef PL_sv_undef
#define PL_sv_undef sv_undef
#endif
#ifdef MUST_DISABLE_FPMASK
fpsetmask(0);
#endif
-
SV*
rrd_error()
OUTPUT:
RETVAL
-
int
rrd_last(...)
PROTOTYPE: @
OUTPUT:
RETVAL
-
int
rrd_create(...)
PROTOTYPE: @
OUTPUT:
RETVAL
-
int
rrd_update(...)
PROTOTYPE: @
OUTPUT:
RETVAL
-
int
rrd_tune(...)
PROTOTYPE: @
OUTPUT:
RETVAL
-
SV *
rrd_graph(...)
PROTOTYPE: @
OUTPUT:
RETVAL
+#ifndef WIN32
int
rrd_flushcached(...)
PROTOTYPE: @
rrdcode(rrd_flushcached);
OUTPUT:
RETVAL
+
+#endif
diff --git a/src/rrd.h b/src/rrd.h
index fb189b2fd73d2a8331d71837235498c7644f7b45..e5e3f95662f269d2087d3b1e013996f1a2ea020e 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
#include <unistd.h> /* for off_t */
#else
#ifdef _MSC_VER
+#ifndef PERLPATCHLEVEL
typedef int mode_t;
+#endif
#define strtoll _strtoi64
#endif
typedef size_t ssize_t;
diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index c09999a23a0ce03fe9064dd281eb2521df3957e6..1c7a641fad9eaca12df384503f3292604ff5b1a8 100644 (file)
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
* Now for some includes..
*/
/* {{{ */
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
#include "../win32/config.h"
#else
#ifdef HAVE_CONFIG_H
diff --git a/src/rrd_format.c b/src/rrd_format.c
index 21d81d8d1686b7061f0ae391d0deb71aae5d5996..dcf671fa1fa0613d47f03ac4b4c456e2b8a84a1d 100644 (file)
--- a/src/rrd_format.c
+++ b/src/rrd_format.c
*
*****************************************************************************/
#include "rrd_tool.h"
+#ifdef WIN32
+#include "stdlib.h"
+#endif
#define converter(VV,VVV) \
if (strcmp(#VV, string) == 0) return VVV;
diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c
index 5f938f398b691366fd2165c68d4e1b65c18297f4..46f7313473caf6bc8b57f952e3b4e05e7c6e3ed9 100644 (file)
--- a/src/rrd_getopt.c
+++ b/src/rrd_getopt.c
#endif
#endif
-
+#ifndef WIN32
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#endif
+#endif
#include "rrd_i18n.h"
diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c
index 15bd2a974be276ee5b0dc18a9387771c032fc576..ea9ed54568bc731b5e7da29efd5ea89691205e9f 100644 (file)
--- a/src/rrd_getopt1.c
+++ b/src/rrd_getopt1.c
#endif
#endif
+#ifndef WIN32
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#endif
+#endif
#include "rrd_getopt.h"
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 3b6da6afc778325b0ada97ccd6c00bd2721ce2fe..e1e1f46fa3ad93e19dcc381526fde5b3e71e85e2 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
,
{3600, 0, TMT_DAY, 1, TMT_WEEK, 1, TMT_WEEK, 1, 7 * 24 * 3600, "Week %V"}
,
- {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600,
- "Week %V"}
+ {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600, "Week %V"}
,
{6 * 3600, 0, TMT_MONTH, 1, TMT_MONTH, 1, TMT_MONTH, 1, 30 * 24 * 3600,
"%b"}
diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index b2b03f7a14637602a387aa680c4963e8b4e7795e..525e01964008d7532659dde68dd798da181da0c4 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
/* this may configure __EXTENSIONS__ without which pango will fail to compile
so load this early */
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
#endif
#include <cairo.h>
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index ca410fd27345e1f289cd81640935b28a69778493..d0340c8784cf79d27b8dd323cf4ac663005f80e6 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
* rrd_tool.c Startup wrapper
*****************************************************************************/
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
#include "../win32/config.h"
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 74a81cc0e0bdc1910d9483d57cc997793209329e..ae519a383e578364befd0a6a6e512b660adb076e 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
#endif
#include "rrd.h"
diff --git a/win32/README b/win32/README
--- /dev/null
+++ b/win32/README
@@ -0,0 +1,11 @@
+Win32 Build Instructions:\r
+\r
+1) Make sure that the contrib file has all the required files for RRDtool\r
+2) Open rrd.sln from Visual Studio\r
+3) Select the 'Release' Build Type\r
+4) Build the Solution\r
+5) rrdtool.exe, and rrdupdate.exe will be located in the Release directory\r
+6) To install, copy the two binaries, along with the host of DLL files to\r
+ their permanent location\r
+7) To build the ActiveState perl module. Follow the instructions under\r
+ the README file under 'binding/perl-shared'\r
diff --git a/win32/config.h b/win32/config.h
index 1a9a9ed01bc8c60140d93fade7a6df61e7725987..587d02e6edfdf8120d7b0a7fff5445716dcdbf30 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
#include <float.h>
#include <direct.h>
#include <ctype.h>
+#include <stdlib.h>
/* realloc does not support NULL as argument */
#define HAVE_VSNPRINTF 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1
+#define HAVE_RRD_GRAPH 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff --git a/win32/rrd.dsp b/win32/rrd.dsp
--- a/win32/rrd.dsp
+++ /dev/null
@@ -1,247 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-\r
-CFG=rrd - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "rrd.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "rrd.mak" CFG="rrd - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF "$(CFG)" == "rrd - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "rrd___Wi"\r
-# PROP BASE Intermediate_Dir "rrd___Wi"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "release"\r
-# PROP Intermediate_Dir "release"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c\r
-# SUBTRACT CPP /X /YX\r
-# ADD BASE RSC /l 0x100c\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-\r
-!ELSEIF "$(CFG)" == "rrd - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "rrd___W0"\r
-# PROP BASE Intermediate_Dir "rrd___W0"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "debug"\r
-# PROP Intermediate_Dir "debug"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c\r
-# SUBTRACT CPP /X /YX\r
-# ADD BASE RSC /l 0x100c\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo /o"rrd.bsc"\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "rrd - Win32 Release"\r
-# Name "rrd - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE="..\src\get_ver.awk"\r
-\r
-!IF "$(CFG)" == "rrd - Win32 Release"\r
-\r
-# PROP Ignore_Default_Tool 1\r
-# Begin Custom Build - Creating ..\rrd_config.h\r
-InputPath="..\src\get_ver.awk"\r
-\r
-"..\rrd_config.h" : $(SOURCE) "..\configure.ac" "..\win32\rrd_config.h.msvc"\r
- awk -f ..\src\get_ver.awk ..\configure.ac ..\win32\rrd_config.h.msvc > ..\rrd_config.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF "$(CFG)" == "rrd - Win32 Debug"\r
-\r
-# PROP Ignore_Default_Tool 1\r
-# Begin Custom Build - Creating ..\rrd_config.h\r
-InputPath="..\src\get_ver.awk"\r
-\r
-"..\rrd_config.h" : $(SOURCE) "..\configure.ac" "..\win32\rrd_config.h.msvc"\r
- awk -f ..\src\get_ver.awk ..\configure.ac ..\win32\rrd_config.h.msvc > ..\rrd_config.h\r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_afm.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_afm_data.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_create.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_diff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_dump.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_error.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_fetch.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_first.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_format.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_gfx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_graph.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_graph_helper.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_hw.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_info.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_last.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_lastupdate.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_nan_inf.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_open.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_resize.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_restore.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_rpncalc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_thread_safe_nt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_tune.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_update.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_version.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_xport.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_getopt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_getopt1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\art_rgba_svp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\hash_32.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_parsetime.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\pngsize.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\src\strftime.c\r
-# End Source File\r
-# End Target\r
-# End Project\r
diff --git a/win32/rrd.sln b/win32/rrd.sln
index 16ff6c178c23b00aaa4d487105f4e72cfb88b01a..59660f7ae280d82c547c68a421d6bcd122c35957 100644 (file)
--- a/win32/rrd.sln
+++ b/win32/rrd.sln
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdlib", "rrdlib.vcproj", "{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}"
- ProjectSection(ProjectDependencies) = postProject
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA} = {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- DebugDLL|Win32 = DebugDLL|Win32
- Release|Win32 = Release|Win32
- Static Debug|Win32 = Static Debug|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.ActiveCfg = Debug|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.Build.0 = Debug|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.ActiveCfg = Release|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.Build.0 = Release|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
- {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.Build.0 = Static Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|Win32.ActiveCfg = Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|Win32.Build.0 = Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
- {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.Build.0 = Static Debug|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdlib", "rrdlib.vcproj", "{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}"\r
+ ProjectSection(ProjectDependencies) = postProject\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94} = {11CD05F8-E5E1-476E-A75F-A112655D4E94}\r
+ EndProjectSection\r
+EndProject\r
+Global\r
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+ Debug|Win32 = Debug|Win32\r
+ DebugDLL|Win32 = DebugDLL|Win32\r
+ Release|Win32 = Release|Win32\r
+ ReleaseDLL|Win32 = ReleaseDLL|Win32\r
+ Static Debug|Win32 = Static Debug|Win32\r
+ EndGlobalSection\r
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.Build.0 = Debug|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.Build.0 = DebugDLL|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.ActiveCfg = Release|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.Build.0 = Release|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.ActiveCfg = Static Debug|Win32\r
+ {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.Build.0 = Static Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|Win32.ActiveCfg = Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.ReleaseDLL|Win32.ActiveCfg = Release|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.ActiveCfg = Static Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.Build.0 = Static Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.Build.0 = Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.DebugDLL|Win32.ActiveCfg = Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.ActiveCfg = Release|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.Build.0 = Release|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.ReleaseDLL|Win32.ActiveCfg = Release|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|Win32.ActiveCfg = Static Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|Win32.Build.0 = Static Debug|Win32\r
+ EndGlobalSection\r
+ GlobalSection(SolutionProperties) = preSolution\r
+ HideSolutionNode = FALSE\r
+ EndGlobalSection\r
+EndGlobal\r
diff --git a/win32/rrd.vcproj b/win32/rrd.vcproj
--- a/win32/rrd.vcproj
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="rrd"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\release"
- IntermediateDirectory=".\release"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="4"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\release/rrd.pch"
- AssemblerListingLocation=".\release/"
- ObjectFile=".\release/"
- ProgramDataBaseFileName=".\release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\release\rrd.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\debug"
- IntermediateDirectory=".\debug"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\debug/rrd.pch"
- AssemblerListingLocation=".\debug/"
- ObjectFile=".\debug/"
- ProgramDataBaseFileName=".\debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\debug\rrd.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="getopt.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="getopt1.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="hash_32.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_parsetime.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="pngsize.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_afm.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_afm_data.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_create.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_diff.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_dump.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_error.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_fetch.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_format.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_gfx.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_graph.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_graph_helper.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_hw.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_info.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_last.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_nan_inf.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_open.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_resize.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_restore.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_rpncalc.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_thread_safe_nt.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_tune.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_update.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_xport.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/win32/rrd_config.h.msvc b/win32/rrd_config.h.msvc
--- a/win32/rrd_config.h.msvc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* config.h.msvc. Hand-tweaked config.h for MSVC compiler. */
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include <math.h>
-#include <float.h>
-#include <direct.h>
-#include <ctype.h>
-
-/* realloc does not support NULL as argument */
-
-#define HAVE_STRFTIME 1
-#define HAVE_TIME_H 1
-#define HAVE_LOCALE_H 1
-#define HAVE_TZSET 1
-#define HAVE_SETLOCALE 1
-#define HAVE_MATH_H 1
-#define HAVE_FLOAT_H 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MKTIME 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRING_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-#define NUMVERS 1.4030
-#define PACKAGE_NAME "rrdtool"
-#define PACKAGE_VERSION "1.4.3"
-#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
-
-#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
-#define isnan _isnan
-#define finite _finite
-#define snprintf _snprintf
-//#define vsnprintf _vsnprintf
-//#define strftime strftime_
-
-#define NO_NULL_REALLOC 1
-#if NO_NULL_REALLOC
-# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
-#else
-# define rrd_realloc(a,b) realloc((a), (b))
-#endif
-
-/* Vertical label angle: 90.0 (default) or 270.0 */
-#define RRDGRAPH_YLEGEND_ANGLE 90.0
-
-#define RRD_DEFAULT_FONT "Courier"
-
-/* #define DEBUG 1 */
-
-__inline int round(double a){int x = (a + 0.5); return x;}
-
-#endif /* CONFIG_H */
diff --git a/win32/rrdlib.vcproj b/win32/rrdlib.vcproj
index 0f334cfd4a6e37af7eb287a3f9ea57cfeb1e9053..bf53b39c30800a8b3a803e460b60def9f8ff79ad 100644 (file)
--- a/win32/rrdlib.vcproj
+++ b/win32/rrdlib.vcproj
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="rrdlib"
- ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"
- RootNamespace="rrdlib"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- LinkLibraryDependencies="true"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile=""
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough="precompiled.h"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;_USE_32BIT_TIME_T"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile="rrdlib.def"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Static Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile=""
- IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\src\hash_32.c"
- >
- </File>
- <File
- RelativePath="..\src\plbasename.c"
- >
- </File>
- <File
- RelativePath="..\src\pngsize.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_create.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_diff.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_dump.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_error.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_fetch.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_first.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_format.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt1.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_gfx.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph_helper.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_math.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_update.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_info.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_last.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_lastupdate.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_nan_inf.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_open.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_parsetime.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_resize.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_restore.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_rpncalc.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_thread_safe_nt.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_tune.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_update.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_utils.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_version.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_xport.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\win32\config.h"
- >
- </File>
- <File
- RelativePath="..\src\fnv.h"
- >
- </File>
- <File
- RelativePath="..\src\plbasename.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_client.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_format.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_math.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_update.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_i18n.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_is_thread_safe.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_parsetime.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_rpncalc.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_tool.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_xport.h"
- >
- </File>
- <File
- RelativePath="..\src\unused.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\rrdlib.def"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="9.00"\r
+ Name="rrdlib"\r
+ ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
+ RootNamespace="rrdlib"\r
+ Keyword="Win32Proj"\r
+ TargetFrameworkVersion="196613"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Win32"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Win32"\r
+ OutputDirectory="$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ WholeProgramOptimization="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough="precompiled.h"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="DebugDLL|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="2"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Static Debug|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="ReleaseDLL|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="2"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="0"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\src\hash_32.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\plbasename.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\pngsize.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_create.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_diff.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_dump.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_error.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_fetch.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_first.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_format.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_getopt.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_getopt1.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_gfx.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_graph.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_graph_helper.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw_math.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw_update.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_info.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_last.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_lastupdate.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_nan_inf.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_open.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_parsetime.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_resize.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_restore.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_rpncalc.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_thread_safe_nt.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_tune.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_update.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_utils.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_version.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_xport.c"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\strftime.c"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+ >\r
+ <File\r
+ RelativePath="..\win32\config.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\fnv.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\plbasename.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_format.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_getopt.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_graph.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw_math.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_hw_update.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_i18n.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_is_thread_safe.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_parsetime.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_rpncalc.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_tool.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_xport.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\strftime.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\unused.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+ >\r
+ <File\r
+ RelativePath=".\rrdlib.def"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/rrdtool.dsp b/win32/rrdtool.dsp
--- a/win32/rrdtool.dsp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrdtool" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=rrdtool - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "rrdtool.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "rrdtool.mak" CFG="rrdtool - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "rrdtool - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "rrdtool - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF "$(CFG)" == "rrdtool - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "rrdtool_"\r
-# PROP BASE Intermediate_Dir "rrdtool_"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "toolrelease"\r
-# PROP Intermediate_Dir "toolrelease"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x100c /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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\r
-# ADD LINK32 libpng.lib zlib.lib libart.lib freetype231MT.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../libpng-1.2.16/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.3.1/objs"\r
-\r
-!ELSEIF "$(CFG)" == "rrdtool - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "rrdtool0"\r
-# PROP BASE Intermediate_Dir "rrdtool0"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "tooldebug"\r
-# PROP Intermediate_Dir "tooldebug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x100c /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo /o"rrdtool.bsc"\r
-LINK32=link.exe\r
-# 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\r
-# ADD LINK32 libpng.lib zlib.lib libart.lib freetype231MT.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../libpng-1.2.16/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.3.1/objs"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "rrdtool - Win32 Release"\r
-# Name "rrdtool - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=..\src\rrd_tool.c\r
-# End Source File\r
-# End Target\r
-# End Project\r
diff --git a/win32/rrdtool.dsw b/win32/rrdtool.dsw
--- a/win32/rrdtool.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "rrd"=".\rrd.dsp" - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "rrdtool"=".\rrdtool.dsp" - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
- Begin Project Dependency\r
- Project_Dep_Name rrd\r
- End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
diff --git a/win32/rrdtool.sln b/win32/rrdtool.sln
--- /dev/null
+++ b/win32/rrdtool.sln
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}"\r
+EndProject\r
+Global\r
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+ Debug|Win32 = Debug|Win32\r
+ Release|Win32 = Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32\r
+ {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(SolutionProperties) = preSolution\r
+ HideSolutionNode = FALSE\r
+ EndGlobalSection\r
+EndGlobal\r
diff --git a/win32/rrdtool.vcproj b/win32/rrdtool.vcproj
index 71394141c3511f28e31a044a87cbfba087fd8847..e434a4a3e38b29269018e7946b5a369b3537bce5 100644 (file)
--- a/win32/rrdtool.vcproj
+++ b/win32/rrdtool.vcproj
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="rrdtool"
- ProjectGUID="{11CD05F8-E5E1-476E-A75F-A112655D4E94}"
- RootNamespace="rrdtool"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- InlineFunctionExpansion="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="3"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="rrdlib.lib"
- ShowProgress="2"
- AdditionalLibraryDirectories=""$(ConfigurationName)""
- IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
- GenerateDebugInformation="true"
- SubSystem="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="get all the dlls, needed for running"
- CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\


"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="rrdlib.lib cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="$(ConfigurationName); ../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"
- GenerateDebugInformation="true"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="get all the dlls, needed for running"
- CommandLine="copy $(ProjectDir)\..\..\contrib\cairo\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libpng\bin\libpng12-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\zlib\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libxml2\lib\libxml2.dll $(TargetDir)\
"
- />
- </Configuration>
- <Configuration
- Name="Static Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- InlineFunctionExpansion="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="3"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="rrdlib.lib cairo.lib"
- ShowProgress="2"
- AdditionalLibraryDirectories=""$(ConfigurationName)";../contrib/lib"
- IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="true"
- SubSystem="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="get all the dlls, needed for running"
- CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\


"
- />
- </Configuration>
- </Configurations>
- <References>
- <ProjectReference
- ReferencedProjectIdentifier="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"
- RelativePathToProject=".\rrdlib.vcproj"
- />
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\src\rrd_tool.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\config.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_tool.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="9.00"\r
+ Name="rrdtool"\r
+ ProjectGUID="{11CD05F8-E5E1-476E-A75F-A112655D4E94}"\r
+ RootNamespace="rrdtool"\r
+ TargetFrameworkVersion="196613"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Win32"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Win32"\r
+ OutputDirectory="$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdtool.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)""\r
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"\r
+ GenerateDebugInformation="true"\r
+ SubSystem="0"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ WholeProgramOptimization="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
+ AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdtool.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="$(ConfigurationName); ../contrib/lib"\r
+ GenerateDebugInformation="false"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Static Debug|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib cairo.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)";../contrib/lib"\r
+ IgnoreDefaultLibraryNames=""\r
+ GenerateDebugInformation="true"\r
+ SubSystem="0"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\


"\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ <ProjectReference\r
+ ReferencedProjectIdentifier="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
+ />\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\src\rrd_tool.c"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+ >\r
+ <File\r
+ RelativePath=".\config.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_tool.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+ >\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/rrdupdate.sln b/win32/rrdupdate.sln
--- /dev/null
+++ b/win32/rrdupdate.sln
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}"\r
+EndProject\r
+Global\r
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+ Debug|Win32 = Debug|Win32\r
+ Release|Win32 = Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.Build.0 = Debug|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.ActiveCfg = Release|Win32\r
+ {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.Build.0 = Release|Win32\r
+ EndGlobalSection\r
+ GlobalSection(SolutionProperties) = preSolution\r
+ HideSolutionNode = FALSE\r
+ EndGlobalSection\r
+EndGlobal\r
diff --git a/win32/rrdupdate.vcproj b/win32/rrdupdate.vcproj
--- /dev/null
+++ b/win32/rrdupdate.vcproj
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="9.00"\r
+ Name="rrdupdate"\r
+ ProjectGUID="{3AAE1E07-78D7-420D-968B-D2087D732D3B}"\r
+ RootNamespace="rrdtool"\r
+ TargetFrameworkVersion="196613"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Win32"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Win32"\r
+ OutputDirectory="$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdupdate.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)""\r
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"\r
+ GenerateDebugInformation="true"\r
+ SubSystem="0"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ WholeProgramOptimization="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="2"\r
+ EnableIntrinsicFunctions="true"\r
+ AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T"\r
+ RuntimeLibrary="2"\r
+ EnableFunctionLevelLinking="true"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdupdate.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="$(ConfigurationName); ../contrib/lib"\r
+ GenerateDebugInformation="true"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Static Debug|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="rrdlib.lib cairo.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)";../contrib/lib"\r
+ IgnoreDefaultLibraryNames=""\r
+ GenerateDebugInformation="true"\r
+ SubSystem="0"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\


"\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ <ProjectReference\r
+ ReferencedProjectIdentifier="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
+ />\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\src\rrdupdate.c"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+ >\r
+ <File\r
+ RelativePath=".\config.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\src\rrd_tool.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+ >\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r