windows portability fixes by guenter knauf[M f3

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1739 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/Makefile.am b/Makefile.am
index 4bbab3e13a6b785dc8e7599449a3253046fd26e2..8f08ea09046742e04f402632e5eb04ba4e9cd692 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = src doc examples bindings
 
   # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
-            rrdtool.spec favicon.ico win32/config.h win32/rrd.dsp win32/rrd.vcproj \
+            rrdtool.spec favicon.ico win32/rrd.dsp win32/rrd.vcproj \
             win32/rrdtool.dsp win32/rrdtool.dsw win32/rrdtool.vcproj win32/Makefile \
             win32/rrd_config.h.msvc netware/Makefile
 

diff --git a/netware/Makefile b/netware/Makefile
index 104e532789243e2097362e96b4f26aa038a6d321..2c1938776e22a642303d941644d84ef46828928c 100644 (file)
--- a/netware/Makefile
+++ b/netware/Makefile
@@ -6,7 +6,7 @@
 #
 
 DESCR  = Round Robin Database Tool $(RRD_VERSION_STR)
-COPYR  = Copyright (c) 1997-2008 by Tobias Oetiker
+COPYR  = Copyright (c) 1997-2009 by Tobias Oetiker
 WWWURL = http://www.rrdtool.org/
 MTSAFE = YES
 #SCREEN        = $(DESCR)
@@ -42,7 +42,7 @@ endif
 # All library code is statically linked to avoid problems with other lib NLMs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.29
+LIBPNG = $(LIBBASE)/libpng-1.2.32
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
@@ -132,10 +132,10 @@ PROOT     = ..
 # Global flags for all compilers
 CFLAGS = $(OPT) -D$(DB) -nostdinc -DNETWARE -DN_PLAT_NLM -D_POSIX_SOURCE
 CFLAGS += -DHAVE_CONFIG_H
-
+                                                                              
 ifeq ($(CC),mwccnlm)
 LD     = mwldnlm
-LDFLAGS        = -nostdlib $^ $(PRELUDE) $(LDLIBS) -o $@ -commandfile
+LDFLAGS        = -nostdlib $^ $(PRELUDE) $(LDLIBS) -nlmversion=$(RRD_VERSION) -o $@ -commandfile
 AR     = $(LD)
 ARFLAGS        = -nostdlib -type library -o
 LIBEXT = lib
@@ -159,7 +159,7 @@ ARFLAGS     = -cq
 LIBEXT = a
 RANLIB = ranlib
 CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
-CFLAGS += -Wall -Wno-unused # -pedantic
+CFLAGS += -Wall -Wno-unused -Wno-return-type # -pedantic
 ifeq ($(LIBARCH),LIBC)
        PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
 else
@@ -288,17 +288,16 @@ ARTLIBOBJS        = \
        $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
 
 OBJS   := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
-OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
-OBJTOOL        := $(OBJS) $(OBJDIR)/rrd_tool.o
 
+LDLIBS += $(OBJDIR)/librrd.$(LIBEXT)
 LDLIBS += $(LIBFT2)/builds/netware/LIBC/libft2.$(LIBEXT)
 
 
 all: rrdtool rrdcgi
 
-rrdtool: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdtool.nlm
-rrdcgi: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
 librrd: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/librrd.$(LIBEXT)
+rrdcgi: librrd $(OBJDIR)/rrdcgi.$(CGIEXT)
+rrdtool: librrd $(OBJDIR)/rrdtool.nlm
 
 FORCE: ;
 
@@ -359,26 +358,20 @@ $(OBJDIR)/%.o: %.c
        @echo Compiling $<
        @$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJDIR)/rrd_cgi.o $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
        @echo Linking $@
        @-$(RM) $@
        @$(LD) $(LDFLAGS) $(@:.$(CGIEXT)=.def)
-ifeq ($(LD),nlmconv)
-       @$(MV) $(notdir $@) $@
-endif
-ifneq ($(CGIEXT),nlm)
 ifeq ($(LD),mwldnlm)
+ifneq ($(CGIEXT),nlm)
        @$(FIXNLMN) $@
 endif
 endif
 
-$(OBJDIR)/rrdtool.nlm: $(OBJTOOL) $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc
+$(OBJDIR)/rrdtool.nlm: $(OBJDIR)/rrd_tool.o $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc
        @echo Linking $@
        @-$(RM) $@
        @$(LD) $(LDFLAGS) $(@:.nlm=.def)
-ifeq ($(LD),nlmconv)
-       @$(MV) $(notdir $@) $@
-endif
 
 $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
        @echo Creating $@
@@ -400,7 +393,9 @@ $(OBJDIR)/%.def: Makefile $(OBJDIR)/version.inc
        @echo $(DL)#$(DL) >> $@
        @echo $(DL)copyright "$(COPYR)"$(DL) >> $@
        @echo $(DL)description "$(DESCR)"$(DL) >> $@
+ifeq ($(LD),nlmconv)
        @echo $(DL)version $(RRD_VERSION)$(DL) >> $@
+endif
 ifdef NLMTYPE
        @echo $(DL)type $(NLMTYPE)$(DL) >> $@
 else
@@ -409,7 +404,7 @@ endif
 ifdef STACK
        @echo $(DL)stack $(STACK)$(DL) >> $@
 endif
-       @echo $(DL)threadname "$(notdir $(@:.def=))"$(DL) >> $@
+       @echo $(DL)threadname "T_$(notdir $(@:.def=))"$(DL) >> $@
 ifdef SCREEN
        @echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
 else
@@ -445,9 +440,10 @@ ifdef XDCOPT
        @echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
 endif
 ifeq ($(LD),nlmconv)
-       @echo $(DL)input $(OBJS) $(LDLIBS)$(DL) >> $@
+       @echo $(DL)input $(subst rrd,rrd_,$(@:.def=.o))$(DL) >> $@
+       @echo $(DL)input $(LDLIBS)$(DL) >> $@
        @echo $(DL)input $(PRELUDE)$(DL) >> $@
-       @echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
+       @echo $(DL)output $(@:.def=.nlm)$(DL) >> $@
 endif
 
 $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
@@ -475,6 +471,7 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
        @echo $(DL)#define HAVE_FLOAT_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
        @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+       @echo $(DL)#define HAVE_LIBGEN_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
        @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
@@ -506,6 +503,7 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
        @echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_TZSET 1$(DL) >> $@
        @echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
+       @echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_VSNPRINTF 1$(DL) >> $@
        @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
        @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@

diff --git a/src/Makefile.am b/src/Makefile.am
index 8407485a65df0bbb268eb49df7189dcab05374ad..217f6744490ecbb55f4f8b130e537221d7bb6b2b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,6 +129,6 @@ rrdtool_LDADD       = librrd.la
 
 # strftime is here because we do not usually need it. unices have propper
 # iso date support
-EXTRA_DIST= strftime.c strftime.h $(fonts_DATA) \
+EXTRA_DIST= strftime.c strftime.h $(fonts_DATA) plbasename.h plbasename.c \
        win32comp.c  rrd_thread_safe_nt.c get_ver.awk
 

diff --git a/src/plbasename.c b/src/plbasename.c
new file mode 100644 (file)
index 0000000..3aec031
--- /dev/null
+++ b/src/plbasename.c
@@ -0,0 +1,208 @@
+/*
+ * Cross-platform basename/dirname 
+ *
+ * Copyright 2005 Syd Logan, All Rights Reserved
+ *
+ * This code is distributed without warranty. You are free to use this
+ * code for any purpose, however, if this code is republished or
+ * redistributed in its original form, as hardcopy or electronically,
+ * then you must include this copyright notice along with the code.
+ *
+ * Minor changes 2008 by Stefan Ludewig stefan.ludewig@exitgames.com
+ * for WIN32 version RRDtool
+ */
+#ifndef HAVE_LIBGEN_H
+
+#include <memory.h>
+#include <stdlib.h>
+#include "plbasename.h"
+#include <string.h>
+#if defined(TEST)
+#include <stdio.h>
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+const char *
+PL_basename(const char *name)
+{
+    const char *base;
+    char *p;
+    static char *tmp = NULL;
+    int len; 
+
+    if (tmp) {
+        free(tmp);
+        tmp = NULL;
+    }
+
+    if (!name || !strcmp(name, ""))
+        return "";
+
+    if (!strcmp(name, "/"))
+        return "/";
+
+    len = strlen(name);
+    if (name[len - 1] == '/') {
+        // ditch the trailing '/'
+        p = tmp = (char*)malloc(len);
+        strncpy(p, name, len - 1); 
+    } else {
+        p = (char *) name;
+    }
+
+    for (base = p; *p; p++) 
+        if (*p == '/') 
+            base = p + 1;
+    
+    return base;
+}
+
+const char *
+PL_dirname(const char *name)
+{
+    static char *ret = NULL;
+    int len;
+    int size = 0;
+    const char *p;
+
+    if (ret) {
+        free(ret);
+        ret = NULL;
+    }
+
+    if (!name || !strcmp(name, "") || !strstr(name, "/"))
+        return(".");
+
+    if (!strcmp(name, "/"))
+        return(name);
+
+    /* find the last slash in the string */
+
+    len = strlen(name);
+    p = &name[len - 1];
+
+    if (*p == '/') p--;  /* skip the trailing */
+
+    while (p != name && *p != '/') p--;
+
+    size = p - name;
+    if (size) {
+        ret = (char*)malloc(size + 1);
+        memcpy(ret, name, size);
+        ret[size] = '\0';
+    } else if (*p == '/')
+        return "/";
+    else
+        return "";
+    
+    return (const char *) ret;
+}
+
+#if defined(__cplusplus)
+}
+#endif 
+
+#if defined(TEST)
+
+int
+main(int argc, char *argv[])
+{
+/*     run the following tests:
+
+       path           dirname        basename
+       "/usr/lib"     "/usr"         "lib"
+       "/usr/"        "/"            "usr"
+       "usr"          "."            "usr"
+       "/"            "/"            "/"
+       "."            "."            "."
+       ".."           "."            ".."
+       NULL           "."            ""
+       ""             "."            ""
+       "./.."         "."            ".."
+
+      These results can be verified by running the unix commands
+      basename(1) and dirname(1). One tweek to the test strategy
+      used here would be, on darwin and linux, to shell out to 
+      get the expected results vs hardcoding. 
+*/
+    if (!strcmp(PL_basename("/usr/lib"), "lib"))
+        printf("PL_basename /usr/lib passed\n");
+    else
+        printf("PL_basename /usr/lib failed expected lib\n");
+    if (!strcmp(PL_dirname("/usr/lib"), "/usr"))
+        printf("PL_dirname /usr/lib passed\n");
+    else
+        printf("PL_dirname /usr/lib failed expected /usr\n");
+    if (!strcmp(PL_basename("/usr/"), "usr"))
+        printf("PL_basename /usr/ passed\n");
+    else
+        printf("PL_basename /usr/ failed expected usr\n");
+    if (!strcmp(PL_dirname("/usr/"), "/"))
+        printf("PL_dirname /usr/ passed\n");
+    else
+        printf("PL_dirname /usr/ failed expected /\n");
+    if (!strcmp(PL_basename("usr"), "usr"))
+        printf("PL_basename usr passed\n");
+    else
+        printf("PL_basename usr failed expected usr\n");
+    if (!strcmp(PL_dirname("usr"), "."))
+        printf("PL_dirname usr passed\n");
+    else
+        printf("PL_dirname usr failed expected .\n");
+    if (!strcmp(PL_basename("/"), "/"))
+        printf("PL_basename / passed\n");
+    else
+        printf("PL_basename / failed expected /\n");
+    if (!strcmp(PL_dirname("/"), "/"))
+        printf("PL_dirname / passed\n");
+    else
+        printf("PL_dirname / failed expected /\n");
+    if (!strcmp(PL_basename("."), "."))
+        printf("PL_basename . passed\n");
+    else
+        printf("PL_basename . failed\n");
+    if (!strcmp(PL_dirname("."), "."))
+        printf("PL_dirname . passed\n");
+    else
+        printf("PL_dirname . failed expected .\n");
+    if (!strcmp(PL_basename(".."), ".."))
+        printf("PL_basename .. passed\n");
+    else
+        printf("PL_basename .. failed expected  ..\n");
+    if (!strcmp(PL_dirname(".."), "."))
+        printf("PL_dirname .. passed\n");
+    else
+        printf("PL_dirname .. failed expected .\n");
+    if (!strcmp(PL_basename(NULL), ""))
+        printf("PL_basename NULL passed\n");
+    else
+        printf("PL_basename NULL failed expected \"\"\n");
+    if (!strcmp(PL_dirname(NULL), "."))
+        printf("PL_dirname NULL passed\n");
+    else
+        printf("PL_dirname NULL failed expected .\n");
+    if (!strcmp(PL_basename(""), ""))
+        printf("PL_basename \"\" passed\n");
+    else
+        printf("PL_basename \"\" failed expected \"\"\n");
+    if (!strcmp(PL_dirname(""), "."))
+        printf("PL_dirname \"\" passed\n");
+    else
+        printf("PL_dirname \"\" failed expected .\n");
+
+    if (!strcmp(PL_basename("./.."), ".."))
+        printf("PL_basename ./.. passed\n");
+    else
+        printf("PL_basename ./.. failed expected ..\n");
+    if (!strcmp(PL_dirname("./.."), "."))
+        printf("PL_dirname ./.. passed\n");
+    else
+        printf("PL_dirname ./.. failed expected .\n");
+}
+#endif
+
+#endif /* HAVE_LIBGEN_H */
+

diff --git a/src/plbasename.h b/src/plbasename.h
new file mode 100644 (file)
index 0000000..d64a1d7
--- /dev/null
+++ b/src/plbasename.h
@@ -0,0 +1,42 @@
+/*
+ * Cross-platform basename/dirname
+ *
+ * Copyright 2005 Syd Logan, All Rights Reserved
+ *
+ * This code is distributed without warranty. You are free to use this
+ * code for any purpose, however, if this code is republished or
+ * redistributed in its original form, as hardcopy or electronically,
+ * then you must include this copyright notice along with the code.
+ *
+ * Minor changes 2008 by Stefan Ludewig stefan.ludewig@exitgames.com
+ * for WIN32 version RRDtool
+ */
+#ifndef __PL_BASENAME_H__
+#define __PL_BASENAME_H__
+
+/*
+       path           dirname        basename
+       "/usr/lib"     "/usr"         "lib"
+       "/usr/"        "/"            "usr"
+       "usr"          "."            "usr"
+       "/"            "/"            "/"
+       "."            "."            "."
+       ".."           "."            ".."
+*/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+const char *PL_basename(const char *name);
+const char *PL_dirname(const char *name);
+
+#define basename(name) ((char*)PL_basename((char*)name))
+#define dirname(name) ((char*)PL_dirname((char*)name))
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __PL_BASENAME_H__ */
+

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 04f1d7cd68a35e6f9649a182b1dbe72606b043be..700ded09774139bfac06e6c8c636719b35b4c81e 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -1,10 +1,22 @@
+/*****************************************************************************
+ * RRDtool 1.2.30  Copyright by Tobi Oetiker, 1997-2009
+ *****************************************************************************
+ * rrd_graph.h  RRD Common Graphic header
+ *****************************************************************************/
+
 #ifndef _RRD_GRAPH_H
 #define _RRD_GRAPH_H
 
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
 #include "rrd_gfx.h"
+
+/* for basename */
+#ifdef HAVE_LIBGEN_H
 #include <libgen.h>
+#else
+#include "plbasename.h"
+#endif
 
 #define MAX_VNAME_LEN 255
 #define DEF_NAM_FMT "%255[-_A-Za-z0-9]"

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 2918dfb7b35b2dd3982bac48a7fa5dce876fdd71..019b3057e3a34122d59c7646ac6cbc0c52adc3a3 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -11,11 +11,7 @@ extern "C" {
 #ifndef _RRD_TOOL_H
 #define _RRD_TOOL_H
 
-#ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
-#endif
 
 #ifdef MUST_DISABLE_SIGFPE
 #include <signal.h>

diff --git a/win32/Makefile b/win32/Makefile
index 528caf596261d7b62b96a817a5073b60fffefd4e..6cd887cc452bf6fe83670c34b1346f3f268d0230 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -6,7 +6,7 @@
 #
 
 DESCR  = Round Robin Database Tool
-COPYR  = Copyright (c) 1997-2008 by Tobias Oetiker
+COPYR  = Copyright (c) 1997-2009 by Tobias Oetiker
 WWWURL = http://www.rrdtool.org/
 ICON   = $(PROOT)/favicon.ico
 
@@ -33,7 +33,7 @@ endif
 # All library code is statically linked to avoid problems with other lib DLLs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.29
+LIBPNG = $(LIBBASE)/libpng-1.2.32
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
@@ -388,6 +388,7 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
        @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
        @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+       @echo $(DL)#define HAVE_LIBGEN_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
        @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@

diff --git a/win32/config.h b/win32/config.h
deleted file mode 100644 (file)
index 965d525..0000000
--- a/win32/config.h
+++ /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>
-
-/* 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_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.2015
-#define PACKAGE_NAME "rrdtool"
-#define PACKAGE_VERSION "1.2.15"
-#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 "arial.ttf"
-/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */
-
-/* #define WITH_PIECHART 1 */
-
-/* #define DEBUG 1 */
-
-#endif /* CONFIG_H */
-

diff --git a/win32/rrd.dsp b/win32/rrd.dsp
index fbc0c1d7e3c62b076a96655617a2a8cbd94eec29..9708518cacaa77ce832fa1c87e3a27fe44a041a2 100644 (file)
--- a/win32/rrd.dsp
+++ b/win32/rrd.dsp
@@ -1,247 +1,254 @@
-# 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\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
+# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=rrd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "rrd.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rrd.mak" CFG="rrd - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rrd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "rrd___Wi"
+# PROP BASE Intermediate_Dir "rrd___Wi"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.34" /I "../../libart_lgpl-2.3.17" /I "../../fr
+eetype-2.3.7/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x100c
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "rrd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "rrd___W0"
+# PROP BASE Intermediate_Dir "rrd___W0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.34" /I "../../libart_lgpl-2.3.17"
+/I "../../freetype-2.3.7/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR
+/FD /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x100c
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"rrd.bsc"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rrd - Win32 Release"
+# Name "rrd - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\src\get_ver.awk"
+
+!IF  "$(CFG)" == "rrd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating ..\rrd_config.h
+InputPath="..\src\get_ver.awk"
+
+"..\rrd_config.h" : $(SOURCE) "..\configure.ac" "..\win32\rrd_config.h.msvc"
+       awk -f ..\src\get_ver.awk ..\configure.ac ..\win32\rrd_config.h.msvc > ..\rrd_config.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "rrd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating ..\rrd_config.h
+InputPath="..\src\get_ver.awk"
+
+"..\rrd_config.h" : $(SOURCE) "..\configure.ac" "..\win32\rrd_config.h.msvc"
+       awk -f ..\src\get_ver.awk ..\configure.ac ..\win32\rrd_config.h.msvc > ..\rrd_config.h
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_afm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_afm_data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_diff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_dump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_fetch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_first.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_format.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_gfx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_graph.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_graph_helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_hw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_last.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_lastupdate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_nan_inf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_resize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_restore.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_rpncalc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_thread_safe_nt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_tune.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_version.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_xport.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_getopt1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\art_rgba_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\hash_32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\parsetime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\plbasename.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\pngsize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\strftime.c
+# End Source File
+# End Target
+# End Project

diff --git a/win32/rrdtool.dsp b/win32/rrdtool.dsp
index 1a192febac8777c06879b358d58b704a3eccf1ea..325ae9f1d4ca7bf529358e6d78271b836e51fb08 100644 (file)
--- a/win32/rrdtool.dsp
+++ b/win32/rrdtool.dsp
@@ -1,92 +1,92 @@
-# 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
+# Microsoft Developer Studio Project File - Name="rrdtool" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=rrdtool - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "rrdtool.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rrdtool.mak" CFG="rrdtool - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rrdtool - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rrdtool - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rrdtool - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "rrdtool_"
+# PROP BASE Intermediate_Dir "rrdtool_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "toolrelease"
+# PROP Intermediate_Dir "toolrelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.34" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.7/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x100c /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libpng.lib zlib.lib libart.lib freetype237MT.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../libpng-1.2.34/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.3.7/objs"
+
+!ELSEIF  "$(CFG)" == "rrdtool - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "rrdtool0"
+# PROP BASE Intermediate_Dir "rrdtool0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "tooldebug"
+# PROP Intermediate_Dir "tooldebug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.34" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.7/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x100c /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"rrdtool.bsc"
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libpng.lib zlib.lib libart.lib freetype237MT.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../libpng-1.2.34/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.3.7/objs"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rrdtool - Win32 Release"
+# Name "rrdtool - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\src\rrd_tool.c
+# End Source File
+# End Target
+# End Project