Fix the Win32 build for executable and perl-shared library.

See NT-BUILD-TIPS.txt for step by step instructions.
Remove VC++ project files not being maintained by anyone.

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

diff --git a/NT-BUILD-TIPS.txt b/NT-BUILD-TIPS.txt
index 0545116f56437dd390225facfee4e8c02c5da314..5fa5e7f5688c1eabda293552500a4f25a8b2f24b 100644 (file)
--- a/NT-BUILD-TIPS.txt
+++ b/NT-BUILD-TIPS.txt
@@ -1,6 +1,134 @@
-Compiling RRDtool 1.1.x on Win32 (WinXP/Win2K with Visual C++):
+Compiling RRDtool 1.1.x on Win32 with Microsoft Visual C++:
 ---------------------------------------------------------------
-5/14/02 Jake Brutlag (jakeb@corp.webtv.net)
+7/29/04 Jake Brutlag
+
+As of Jan 2004, code for libraries utilized by rrdtool 
+(png, libart, freetype, and zlib) is no longer distributed with
+rrdtool. This requires some changes to the compile process on
+Win32. The solution described here is to compile rrdtool to
+link against these libraries dynamically. There is an advantage
+to this approach: namely the rrdtool distribution doesn't have to
+worry about how to compile these libraries on Win32. In theory,
+since others already provide and maintain Win32 binaries for these
+libraries the users don't have to worry about how to compile them
+either. The disadvantage of this approach is that the DLLs for
+these libraries must be available on the hosts where rrdtool will run.
+
+Here are step by step instructions for compiling rrdtool.exe and
+the perl shared library (RRDS.dll) with Microsoft Visual C++ 6.0.
+(1) Download libraries rrdtool depends on from GnuWin32:
+http://gnuwin32.sourceforge.net/
+For freetype, libpng, and zlib download the "Complete Package"; each of
+these will be a self-extracting self-installing executable.
+For libart, download both the "Binaries" and "Developer Files" packages.
+Unfortunately at this time GnuWin32 doesn't provide the "Complete Package"
+installer for libart. Perhaps by the time you are following these
+instructions GnuWin32 will have a "Complete Package" for libart.
+(2) Install the GnuWin32 libraries by running the executables for freetype,
+libpng, and zlib. These instructions and the Visual C++ project files
+distributed with rrdtool assume that you will use the default install
+location: C:\Program Files\GnuWin32. Extract the two zip files for libart,
+libart-2.3.3-bin.zip and libart-2.3.3-1-lib.zip into the GnuWin32 directory;
+the appropriate libart files will be added to the include, lib, and bin
+subdirectories.
+(3) Add C:\Program Files\GnuWin32\bin to the PATH (Control Panel ->
+System -> Advanced -> Environment Variables).
+(4) Start Microsoft Visual C++ 6.0. Load the workspace file, rrdtool.dsw,
+from the src subdirectory of your rrdtool code directory.
+(5) Compile the Release build of the rrdtool project (since rrdtool depends
+on the rrd project, the rrd library will also be compiled). At this
+time, the compile will fail in zconf.h, a zlib header file. The problem
+is a preprocessor directive that loads unistd.h. Open zconf.h in VC++
+(this file is in C:\Program Files\GnuWin32\include) and find the following
+code block:
+
+#if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t  off_t
+#endif 
+
+Change it to reads as follows (this is code from zlib-1.1.4):
+
+#if HAVE_UNISTD_H
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t  off_t
+#endif 
+
+Note that it is actually just a one line change. Save the file and
+recompile rrdtool. By the time you are following these instructions
+this issue with zconf.h may be resolved.
+(6) At this point, you can run the executable rrdtool.exe in the
+src\toolrelease subdirectory. Note that if you wish to run rrdtool
+on other machines, you will need the following DLLs installed (on the
+path) on those machines:
+zlib1.dll
+libpng12.dll
+libart_lgpl.dll
+freetype6.dll
+msvcrt.dll
+The names of the first four DLLs might vary from what is listed here
+depending on the versions of the packages you downloaded from GnuWin32.
+The fifth DLL, msvcrt.dll, is a system DLL for most versions of Windows.
+If you are running on old version of Windows, you can install/upgrade to
+IE4.0 to get this DLL.
+(7) To compile the perl-shared library, open a Command Prompt (DOS box)
+and cd to the bindings\perl-shared subdirectory.
+(8) Run vcvars32.bat; this batch file, in your vc98\bin directory will
+set necessary environment options for command line compiling.
+(9) In bindings\perl-shared, run
+perl ntmake.pl
+nmake
+nmake test
+If nmake test succeeds, you are good to go. RRDs.dll is in 
+blib\arch\auto\RRDs. If you plan to install via the Active State ppm
+tool, tar and gzip the blib directory. You can use the RRDs.ppd file
+in bindings\perl-shared directory. Remember that as in the case of
+rrdtool.exe you will need the DLLs listed in (6) on the machine where
+you are going to use RRDs.dll.
+
+Microsoft Visual C++ 7.1 (.NET 2003):
+
+Unfortunately, this is more difficult than with VC++ 6.0. The problem
+is that by default the C runtime dll for VC++ 7.1 is msvcr71.dll rather
+than msvcrt.dll. The GnuWin32 library binaries are all compiled
+to use msvcrt.dll and you can't mix msvcr71.dll and msvcrt.dll in the
+same process. One option is to download the source code for the libraries
+(available from http://gnuwin32.sourceforge.net) recompile them with
+VC++ 7.l. Then all the components will use msvcr71.dll. Once you are
+going to go this route, you can also use static multi-threaded libraries
+and use static linking between rrdtool (or RRDs.dll) and its dependencies.
+
+To use the GnuWin32 library binaries, you need to trick VC++ 7.1 into
+compiling rrdtool to use the older msvcrt.dll. Follow steps (1) - (3)
+as above, then:
+(4) Obtain a different version of the msvcrt.lib import library that
+is compatible with vc7 and points to msvcrt.dll:
+msvcrtlib_for_vc7.zip from http://xchat.org/win32/testing
+Backup msvcrt.lib in your vc7\lib directory 
+(\Program Files\Microsoft Visual Studio .NET 2003\vc7\lib)
+Then extract the msvcrt.lib from the zip file into the vc7\lib directory.
+WARNING: Use this msvcrt.lib at your own risk! This is not a Microsoft
+supplied file nor a file supported by anyone associated with rrdtool.
+(5) Start Microsoft Visual C++ 7.1. Load the solution file, rrdtool.sln,
+from the src subdirectory of your rrdtool code directory. Edit zconf.h,
+as needed, as described under (5) above. Compile the release build of
+the rrdtool project.
+Proceed with steps (6) - (9) as above, if you are using/picking up
+the wrong msvcrt.lib import library then nmake test for perl-shared
+will fail.
+
+Note: it is possible in the future that GnuWin32 will provide Win32
+binaries that utilize msvcr71.dll rather than msvcrt.dll.
+
+5/14/02 Jake Brutlag
 
 These notes share some insight I gained compiling 1.1.x with
 MS Visual C++ 6.0 (using project files). This information may or

diff --git a/bindings/perl-shared/RRDs.ppd b/bindings/perl-shared/RRDs.ppd
new file mode 100755 (executable)
index 0000000..e44f6d3
--- /dev/null
+++ b/bindings/perl-shared/RRDs.ppd
@@ -0,0 +1,10 @@
+<SOFTPKG NAME="RRDs" VERSION="1,100001,0,0">
+       <TITLE>RRDs</TITLE>
+       <ABSTRACT>Round Robin Database Tool</ABSTRACT>
+       <AUTHOR>Tobias Oetiker (oetiker@ee.ethz.ch)</AUTHOR>
+       <IMPLEMENTATION>
+               <OS NAME="MSWin32" />
+               <ARCHITECTURE NAME="MSWin32-x86-multi-thread-5.8" />
+               <CODEBASE HREF="RRDs.tar.gz" />
+       </IMPLEMENTATION>
+</SOFTPKG>

diff --git a/bindings/perl-shared/ntmake.pl b/bindings/perl-shared/ntmake.pl
index 76eab97be1824357a89a044094ab995d362c9a17..e3fd3c244415ab8e7ecf76c59c444c10144b5780 100644 (file)
--- a/bindings/perl-shared/ntmake.pl
+++ b/bindings/perl-shared/ntmake.pl
@@ -2,21 +2,21 @@ use ExtUtils::MakeMaker;
 use Config;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
-# This file is current set to compile with ActiveState 5xx builds
-# (perl 5.005_03). Hopefully this lowest common denominator
-# approach will work with newer ActiveState builds (i.e. 6xx).
+# Run VCVARS32.BAT before generating makefile/compiling.
 WriteMakefile(
     'NAME'     => 'RRDs',
     'VERSION_FROM' => 'RRDs.pm',
 #    'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+# keep compatible w/ ActiveState 5xx builds
     'DEFINE'      => "-DPERLPATCHLEVEL=5",
 
-   'INC'       => '-I../../src/ -I../../libraries/freetype-2.0.5/include -I ../../libraries/libart_lgpl-2.3.7 -I ../../libraries/zlib-1.1.4 -I ../../libraries/libpng-1.2.0',
-   'OPTIMIZE' => '-O2 -MT',
-# change this path to refer to your libc.lib
-# keep one line for MSVC++ 6.0 and one for 7.0
-    'MYEXTLIB'  => '"' . $ENV{'MSVCDir'} . '/lib/libc.lib" ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0/release/png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
-#   'MYEXTLIB'  => '"$(VCINSTALLDIR)/vc7/lib/libcmt.lib" ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0\release\png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
+   'INC'       => '-I../../src/ "-I/Program Files/GnuWin32/include"',
+# Since we are now using GnuWin32 libraries dynamically (instead of static
+# complile with code redistributed with rrdtool), use /MD instead of /MT.
+# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
+# and it is available on most versions of Windows.
+   'OPTIMIZE' => '-O2 -MD',
+   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
     ($] ge '5.005') ? (
         'AUTHOR' => 'Tobias Oetiker (oetiker@ee.ethz.ch)',

diff --git a/bindings/perl-shared/rrdpl.dsp b/bindings/perl-shared/rrdpl.dsp
deleted file mode 100644 (file)
index bf3a15d..0000000
--- a/bindings/perl-shared/rrdpl.dsp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-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 "rrdpl.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 "rrdpl.mak" CFG="rrd - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "rrd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x100c /d "NDEBUG"
-# ADD RSC /l 0x100c /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:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "rrd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "C:\perl\lib\site\auto\RRD\"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /W3 /I "C:\perl\lib\CORE" /D "WIN32" /D VERSION=\"0.02\" /D XS_VERSION=\"0.02\" /D "_DEBUG" /D "_CONSOLE" /FR -I../src/ -I../gd1.2 RRD.c /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x100c /d "_DEBUG"
-# ADD RSC /l 0x100c /d "_DEBUG"
-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:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 c:\perl\lib\core\perl.lib ..\src\debug\rrd.lib ..\gd1.2\debug\gd.lib /dll /incremental:no /debug /machine:IX86 /out:"C:\perl\lib\site\auto\RRD\rrd.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rrd - Win32 Release"
-# Name "rrd - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\RRD.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\RRD.xs
-
-!IF  "$(CFG)" == "rrd - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "rrd - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\RRD.xs
-
-"rrd.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       C:\Perl\bin\perl -Ic:\perl\lib -Ic:\perl\lib C:\perl\lib\ExtUtils/xsubpp\
-    -typemap C:\perl\lib\ExtUtils\typemap RRD.xs >RRD.tc && C:\Perl\bin\perl\
-   -Ic:\perl\lib -Ic:\perl\lib -MExtUtils::Command -e mv RRD.tc RRD.c
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project

diff --git a/bindings/perl-shared/rrdpl.dsw b/bindings/perl-shared/rrdpl.dsw
deleted file mode 100644 (file)
index 73296e1..0000000
--- a/bindings/perl-shared/rrdpl.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

diff --git a/confignt/config.h b/confignt/config.h
index 9ffb77ea7a59404371ebf737aaac5f96637a21ed..7b9d68cda6f84c7dd498dc224756a17c28fd0120 100644 (file)
--- a/confignt/config.h
+++ b/confignt/config.h
@@ -23,3 +23,7 @@
  * (2) windir might not be available in all environments
  */
 #define RRD_DEFAULT_FONT "c:/windows/fonts/cour.ttf"
+
+#define RRDGRAPH_YLEGEND_ANGLE 90.0
+
+#define HAVE_STRING_H 1

diff --git a/src/rd_cgi.dsp b/src/rd_cgi.dsp
deleted file mode 100644 (file)
index 425f765..0000000
--- a/src/rd_cgi.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rd_cgi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rd_cgi - 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 "rd_cgi.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 "rd_cgi.mak" CFG="rd_cgi - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rd_cgi - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rd_cgi - 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)" == "rd_cgi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "rd_cgi___Win32_Release"
-# PROP BASE Intermediate_Dir "rd_cgi___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "rd_cgi___Win32_Release"
-# PROP Intermediate_Dir "rd_cgi___Win32_Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /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  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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
-
-!ELSEIF  "$(CFG)" == "rd_cgi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "rd_cgi___Win32_Debug"
-# PROP BASE Intermediate_Dir "rd_cgi___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "rd_cgi___Win32_Debug"
-# PROP Intermediate_Dir "rd_cgi___Win32_Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rd_cgi - Win32 Release"
-# Name "rd_cgi - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/src/rrd.dsp b/src/rrd.dsp
index 38aa7ccfb3e78e1bc156615f85e1663628118527..61e102c3912feae184e8b3838f65589a852939e4 100644 (file)
--- a/src/rrd.dsp
+++ b/src/rrd.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "\Program Files\GnuWin32\include" /I "\Program Files\GnuWin32\include\freetype2" /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 0x100c
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "\Program Files\GnuWin32\include\freetype2" /I "\Program Files\GnuWin32\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
 # SUBTRACT CPP /X /YX
 # ADD BASE RSC /l 0x100c
 # ADD RSC /l 0x100c

diff --git a/src/rrd.dsw b/src/rrd.dsw
deleted file mode 100644 (file)
index d50279b..0000000
--- a/src/rrd.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

diff --git a/src/rrd.vcproj b/src/rrd.vcproj
index c77c6668ba4012fa148c9d3ca2fa27874785b2d1..07df4379672ef3570a29b358215a71157af74c35 100644 (file)
--- a/src/rrd.vcproj
+++ b/src/rrd.vcproj
@@ -21,9 +21,9 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="4"
-                               AdditionalIncludeDirectories="..\libraries\libpng-1.2.0,..\libraries\zlib-1.1.4,..\libraries\libart_lgpl-2.3.7,..\libraries\freetype-2.0.5\include"
+                               AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CTYPE_DISABLE_MACROS"
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\release/rrd.pch"
                                AssemblerListingLocation=".\release/"
                                ObjectFile=".\release/"
@@ -68,9 +68,9 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\libraries\libpng-1.2.0,..\libraries\zlib-1.1.4,..\libraries\libart_lgpl-2.3.7,..\libraries\freetype-2.0.5\include"
+                               AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\debug/rrd.pch"
                                AssemblerListingLocation=".\debug/"
                                ObjectFile=".\debug/"

diff --git a/src/rrd_afm.c b/src/rrd_afm.c
index c9996d0b24031dd946a3816647af1820546ee283..47e4c77829640ad01387481635202a3d5279ae96 100644 (file)
--- a/src/rrd_afm.c
+++ b/src/rrd_afm.c
@@ -4,7 +4,11 @@
  * rrd_afm.h  Parsing afm tables to find width of strings.
  ****************************************************************************/
 
+#ifdef WIN32
+#include "../confignt/config.h"
+#else
 #include "config.h"
+#endif
 
 #include "rrd_afm.h"
 #include "rrd_afm_data.h"

diff --git a/src/rrd_cgi.dsp b/src/rrd_cgi.dsp
deleted file mode 100644 (file)
index 4e7bd1d..0000000
--- a/src/rrd_cgi.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrd_cgi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rrd_cgi - 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_cgi.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_cgi.mak" CFG="rrd_cgi - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "rrd_cgi - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rrd_cgi - 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)" == "rrd_cgi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "rrd_cgi___Win32_Release"
-# PROP BASE Intermediate_Dir "rrd_cgi___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "rrd_cgi_Release"
-# PROP Intermediate_Dir "rrd_cgi_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\gd1.3" /I "..\cgilib-0.4" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\release\gd.lib release\rrd.lib ..\cgilib-0.4\release\cgilib.lib ..\zlib-1.1.3\Release\zlib.lib ..\libpng-1.0.3\Release\png.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "rrd_cgi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "rrd_cgi___Win32_Debug"
-# PROP BASE Intermediate_Dir "rrd_cgi___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "rrd_cgi_Debug"
-# PROP Intermediate_Dir "rrd_cgi_Debug"
-# 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 /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\gd1.3" /I "..\cgilib-0.4" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\debug\gd.lib debug\rrd.lib ..\cgilib-0.4\debug\cgilib.lib ..\zlib-1.1.3\Debug\zlib.lib ..\libpng-1.0.3\Debug\png.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "rrd_cgi - Win32 Release"
-# Name "rrd_cgi - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\rrd_cgi.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

diff --git a/src/rrd_cgi.vcproj b/src/rrd_cgi.vcproj
deleted file mode 100644 (file)
index e90ce38..0000000
--- a/src/rrd_cgi.vcproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="rrd_cgi"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\rrd_cgi_Debug"
-                       IntermediateDirectory=".\rrd_cgi_Debug"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=".,..\gd1.3,..\cgilib-0.4,..\libpng-1.0.3,..\zlib-1.1.3"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\rrd_cgi_Debug/rrd_cgi.pch"
-                               AssemblerListingLocation=".\rrd_cgi_Debug/"
-                               ObjectFile=".\rrd_cgi_Debug/"
-                               ProgramDataBaseFileName=".\rrd_cgi_Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="4"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib ..\gd1.3\debug\gd.lib debug\rrd.lib ..\cgilib-0.4\debug\cgilib.lib ..\zlib-1.1.3\Debug\zlib.lib ..\libpng-1.0.3\Debug\png.lib"
-                               OutputFile=".\rrd_cgi_Debug/rrd_cgi.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\rrd_cgi_Debug/rrd_cgi.pdb"
-                               SubSystem="1"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\rrd_cgi_Debug/rrd_cgi.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\rrd_cgi_Release"
-                       IntermediateDirectory=".\rrd_cgi_Release"
-                       ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=".,..\gd1.3,..\cgilib-0.4"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CTYPE_DISABLE_MACROS"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               PrecompiledHeaderFile=".\rrd_cgi_Release/rrd_cgi.pch"
-                               AssemblerListingLocation=".\rrd_cgi_Release/"
-                               ObjectFile=".\rrd_cgi_Release/"
-                               ProgramDataBaseFileName=".\rrd_cgi_Release/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib ..\gd1.3\release\gd.lib release\rrd.lib ..\cgilib-0.4\release\cgilib.lib ..\zlib-1.1.3\Release\zlib.lib ..\libpng-1.0.3\Release\png.lib"
-                               OutputFile=".\rrd_cgi_Release/rrd_cgi.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               ProgramDatabaseFile=".\rrd_cgi_Release/rrd_cgi.pdb"
-                               SubSystem="1"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\rrd_cgi_Release/rrd_cgi.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-                       <File
-                               RelativePath="rrd_cgi.c">
-                               <FileConfiguration
-                                       Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               Optimization="0"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"/>
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               Optimization="2"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl">
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 3e55490c906d3c550f83bab8a073a6f4c9cce28b..817195b65d6301ac2d6da6355d23b86a0f64acb0 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -8,6 +8,12 @@
 #include "rrd_rpncalc.h"
 #include <fcntl.h>
 
+#ifdef WIN32
+#include <io.h>
+#define open _open
+#define close _close
+#endif
+
 /* Prototypes */
 
 void xml_lc(char*);

diff --git a/src/rrdtool.dsp b/src/rrdtool.dsp
index 3f24fd85b6281266517e31b1f814d2766f510c44..215ac7d85a2739fa84330bd0070884362a28f4c2 100644 (file)
--- a/src/rrdtool.dsp
+++ b/src/rrdtool.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "\Program Files\GnuWin32\include" /I "\Program Files\GnuWin32\include\freetype2" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "NDEBUG"
 # ADD RSC /l 0x100c /d "NDEBUG"
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\release\png.lib ..\libraries\zlib-1.1.4\release\zlib.lib ..\libraries\libart_lgpl-2.3.7\release\libart.lib ..\libraries\freetype-2.0.5\release\freetype.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386
+# ADD LINK32 libpng.lib libz.lib libart_lgpl.lib libfreetype.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"\Program Files\GnuWin32\lib"
 
 !ELSEIF  "$(CFG)" == "rrdtool - Win32 Debug"
 
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\libraries\libpng-1.2.0" /I "..\libraries\zlib-1.1.4" /I "..\libraries\libart_lgpl-2.3.7" /I "..\libraries\freetype-2.0.5\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "\Program Files\GnuWin32\include\freetype2" /I "\Program Files\GnuWin32\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "_DEBUG"
 # ADD RSC /l 0x100c /d "_DEBUG"
@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"rrdtool.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\Debug\png.lib ..\libraries\zlib-1.1.4\Debug\zlib.lib ..\libraries\libart_lgpl-2.3.7\Debug\libart.lib ..\libraries\freetype-2.0.5\Debug\freetype.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libpng.lib libz.lib libart_lgpl.lib libfreetype.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\Program Files\GnuWin32\lib"
 
 !ENDIF 
 

diff --git a/src/rrdtool.dsw b/src/rrdtool.dsw
index a8ad5a6c7219d136da394302ef312618a1ca881b..49f1673fa1569de9b2c0a5a02d5f54e16f0a6aa7 100644 (file)
--- a/src/rrdtool.dsw
+++ b/src/rrdtool.dsw
@@ -3,57 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "cgilib"="..\libraries\cgilib-0.4\cgilib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "freetype"="..\libraries\freetype-2.0.5\freetype.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libart"="..\libraries\libart_lgpl-2.3.7\libart.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "png"="..\libraries\libpng-1.2.0\png.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -66,24 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "rrd_cgi"=".\rrd_cgi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cgilib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name rrd
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "rrdtool"=".\rrdtool.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -95,30 +26,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name rrd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name freetype
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libart
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name png
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zlib"="..\libraries\zlib-1.1.4\zlib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
 }}}
 
 ###############################################################################

diff --git a/src/rrdtool.sln b/src/rrdtool.sln
index 765b1a454542695535119880d58cb9449d8f0b4b..3aaa7386ebc089e475c11e41d0066ec2432c0104 100644 (file)
--- a/src/rrdtool.sln
+++ b/src/rrdtool.sln
@@ -1,43 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgilib", "..\libraries\cgilib-0.4\cgilib.vcproj", "{02256094-BBB3-4792-94D6-A9B6D6ADD8AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrd", "rrd.vcproj", "{8DF24CAC-DF33-4131-8584-529054E341B3}"
        ProjectSection(ProjectDependencies) = postProject
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\libraries\freetype-2.0.5\freetype.vcproj", "{B4326A72-B07E-4C86-BD90-769F06C1D19B}"
-       ProjectSection(ProjectDependencies) = postProject
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libart", "..\libraries\libart_lgpl-2.3.7\libart.vcproj", "{1ED76D7D-0869-4445-9B75-44046552B8F0}"
-       ProjectSection(ProjectDependencies) = postProject
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\libraries\libpng-1.2.0\png.vcproj", "{EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}"
-       ProjectSection(ProjectDependencies) = postProject
-               {10442D5F-AB42-4DE2-B023-0621C8246933} = {10442D5F-AB42-4DE2-B023-0621C8246933}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrd", "rrd.vcproj", "{1B3BDE03-74E3-461E-A644-A78DDE14E990}"
-       ProjectSection(ProjectDependencies) = postProject
-               {1ED76D7D-0869-4445-9B75-44046552B8F0} = {1ED76D7D-0869-4445-9B75-44046552B8F0}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrd_cgi", "rrd_cgi.vcproj", "{684AF5F9-D687-4224-896B-D21BDA80D424}"
-       ProjectSection(ProjectDependencies) = postProject
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990} = {1B3BDE03-74E3-461E-A644-A78DDE14E990}
-               {02256094-BBB3-4792-94D6-A9B6D6ADD8AC} = {02256094-BBB3-4792-94D6-A9B6D6ADD8AC}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{6ABDEADD-BE46-4D87-9885-D64E0D2DB03A}"
-       ProjectSection(ProjectDependencies) = postProject
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990} = {1B3BDE03-74E3-461E-A644-A78DDE14E990}
-               {10442D5F-AB42-4DE2-B023-0621C8246933} = {10442D5F-AB42-4DE2-B023-0621C8246933}
-               {B4326A72-B07E-4C86-BD90-769F06C1D19B} = {B4326A72-B07E-4C86-BD90-769F06C1D19B}
-               {1ED76D7D-0869-4445-9B75-44046552B8F0} = {1ED76D7D-0869-4445-9B75-44046552B8F0}
-               {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84} = {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\libraries\zlib-1.1.4\zlib.vcproj", "{10442D5F-AB42-4DE2-B023-0621C8246933}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{3A5A6297-3F61-498A-BA72-66D36144901B}"
        ProjectSection(ProjectDependencies) = postProject
+               {8DF24CAC-DF33-4131-8584-529054E341B3} = {8DF24CAC-DF33-4131-8584-529054E341B3}
        EndProjectSection
 EndProject
 Global
@@ -46,38 +14,14 @@ Global
                Release = Release
        EndGlobalSection
        GlobalSection(ProjectConfiguration) = postSolution
-               {02256094-BBB3-4792-94D6-A9B6D6ADD8AC}.Debug.ActiveCfg = Debug|Win32
-               {02256094-BBB3-4792-94D6-A9B6D6ADD8AC}.Debug.Build.0 = Debug|Win32
-               {02256094-BBB3-4792-94D6-A9B6D6ADD8AC}.Release.ActiveCfg = Release|Win32
-               {02256094-BBB3-4792-94D6-A9B6D6ADD8AC}.Release.Build.0 = Release|Win32
-               {B4326A72-B07E-4C86-BD90-769F06C1D19B}.Debug.ActiveCfg = Debug|Win32
-               {B4326A72-B07E-4C86-BD90-769F06C1D19B}.Debug.Build.0 = Debug|Win32
-               {B4326A72-B07E-4C86-BD90-769F06C1D19B}.Release.ActiveCfg = Release|Win32
-               {B4326A72-B07E-4C86-BD90-769F06C1D19B}.Release.Build.0 = Release|Win32
-               {1ED76D7D-0869-4445-9B75-44046552B8F0}.Debug.ActiveCfg = Debug|Win32
-               {1ED76D7D-0869-4445-9B75-44046552B8F0}.Debug.Build.0 = Debug|Win32
-               {1ED76D7D-0869-4445-9B75-44046552B8F0}.Release.ActiveCfg = Release|Win32
-               {1ED76D7D-0869-4445-9B75-44046552B8F0}.Release.Build.0 = Release|Win32
-               {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}.Debug.ActiveCfg = Debug|Win32
-               {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}.Debug.Build.0 = Debug|Win32
-               {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}.Release.ActiveCfg = Release|Win32
-               {EC01DFAF-6F42-45CD-BDD7-DA04C7A98A84}.Release.Build.0 = Release|Win32
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990}.Debug.ActiveCfg = Debug|Win32
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990}.Debug.Build.0 = Debug|Win32
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990}.Release.ActiveCfg = Release|Win32
-               {1B3BDE03-74E3-461E-A644-A78DDE14E990}.Release.Build.0 = Release|Win32
-               {684AF5F9-D687-4224-896B-D21BDA80D424}.Debug.ActiveCfg = Debug|Win32
-               {684AF5F9-D687-4224-896B-D21BDA80D424}.Debug.Build.0 = Debug|Win32
-               {684AF5F9-D687-4224-896B-D21BDA80D424}.Release.ActiveCfg = Release|Win32
-               {684AF5F9-D687-4224-896B-D21BDA80D424}.Release.Build.0 = Release|Win32
-               {6ABDEADD-BE46-4D87-9885-D64E0D2DB03A}.Debug.ActiveCfg = Debug|Win32
-               {6ABDEADD-BE46-4D87-9885-D64E0D2DB03A}.Debug.Build.0 = Debug|Win32
-               {6ABDEADD-BE46-4D87-9885-D64E0D2DB03A}.Release.ActiveCfg = Release|Win32
-               {6ABDEADD-BE46-4D87-9885-D64E0D2DB03A}.Release.Build.0 = Release|Win32
-               {10442D5F-AB42-4DE2-B023-0621C8246933}.Debug.ActiveCfg = Debug|Win32
-               {10442D5F-AB42-4DE2-B023-0621C8246933}.Debug.Build.0 = Debug|Win32
-               {10442D5F-AB42-4DE2-B023-0621C8246933}.Release.ActiveCfg = Release|Win32
-               {10442D5F-AB42-4DE2-B023-0621C8246933}.Release.Build.0 = Release|Win32
+               {8DF24CAC-DF33-4131-8584-529054E341B3}.Debug.ActiveCfg = Debug|Win32
+               {8DF24CAC-DF33-4131-8584-529054E341B3}.Debug.Build.0 = Debug|Win32
+               {8DF24CAC-DF33-4131-8584-529054E341B3}.Release.ActiveCfg = Release|Win32
+               {8DF24CAC-DF33-4131-8584-529054E341B3}.Release.Build.0 = Release|Win32
+               {3A5A6297-3F61-498A-BA72-66D36144901B}.Debug.ActiveCfg = Debug|Win32
+               {3A5A6297-3F61-498A-BA72-66D36144901B}.Debug.Build.0 = Debug|Win32
+               {3A5A6297-3F61-498A-BA72-66D36144901B}.Release.ActiveCfg = Release|Win32
+               {3A5A6297-3F61-498A-BA72-66D36144901B}.Release.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
        EndGlobalSection

diff --git a/src/rrdtool.suo b/src/rrdtool.suo
deleted file mode 100644 (file)
index 40ca21e..0000000
Binary files a/src/rrdtool.suo and /dev/null differ

diff --git a/src/rrdtool.vcproj b/src/rrdtool.vcproj
index 4caaa321c227131bf8e559bbb02c605a2e29b405..dad37e724c96db6ff9dc1810a5f0410a33752579 100644 (file)
--- a/src/rrdtool.vcproj
+++ b/src/rrdtool.vcproj
@@ -21,9 +21,9 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="4"
-                               AdditionalIncludeDirectories="..\libraries\libpng-1.2.0,..\libraries\zlib-1.1.4,..\libraries\libart_lgpl-2.3.7,..\libraries\freetype-2.0.5\include"
+                               AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;_CTYPE_DISABLE_MACROS;MAKE_TIMESTAMP=\&quot;WIN32\&quot;"
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\toolrelease/rrdtool.pch"
                                AssemblerListingLocation=".\toolrelease/"
                                ObjectFile=".\toolrelease/"
@@ -35,10 +35,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\release\png.lib ..\libraries\zlib-1.1.4\release\zlib.lib ..\libraries\libart_lgpl-2.3.7\release\libart.lib ..\libraries\freetype-2.0.5\release\freetype.lib"
+                               AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
                                OutputFile=".\toolrelease/rrdtool.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
+                               AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\toolrelease/rrdtool.pdb"
                                SubSystem="1"
@@ -79,9 +80,9 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\libraries\libpng-1.2.0,..\libraries\zlib-1.1.4,..\libraries\libart_lgpl-2.3.7,..\libraries\freetype-2.0.5\include"
+                               AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
                                PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_CTYPE_DISABLE_MACROS;MAKE_TIMESTAMP=\&quot;WIN32\&quot;"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\tooldebug/rrdtool.pch"
                                AssemblerListingLocation=".\tooldebug/"
                                ObjectFile=".\tooldebug/"
@@ -95,10 +96,11 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbc32.lib odbccp32.lib ..\libraries\libpng-1.2.0\Debug\png.lib ..\libraries\zlib-1.1.4\Debug\zlib.lib ..\libraries\libart_lgpl-2.3.7\Debug\libart.lib ..\libraries\freetype-2.0.5\Debug\freetype.lib"
+                               AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
                                OutputFile=".\tooldebug/rrdtool.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
+                               AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\tooldebug/rrdtool.pdb"
                                SubSystem="1"