From: Dongsheng Song Date: Sat, 4 May 2013 06:47:41 +0000 (+0800) Subject: Merge WIN32-BUILD-TIPS.txt and win32\README, then remove outdated files X-Git-Tag: v1.5.0-rc1~181^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a3910fbe0ec5ff444bd86b230bddc17583e2578;p=thirdparty%2Frrdtool-1.x.git Merge WIN32-BUILD-TIPS.txt and win32\README, then remove outdated files --- diff --git a/WIN32-BUILD-TIPS.txt b/WIN32-BUILD-TIPS.txt deleted file mode 100644 index c80acc85..00000000 --- a/WIN32-BUILD-TIPS.txt +++ /dev/null @@ -1,385 +0,0 @@ -Compiling RRDtool on Win32 with Microsoft Visual C++: ---------------------------------------------------------------- -2010-06-04 Chris Larsen clarsen@euphoriaaudio.com -2008-03-12 Stefan Ludewig stefan.ludewig@exitgames.com - -Here are step by step instructions for building rrdlib.lib and rrdtool.exe -version 1.3.5 and newer with Microsoft Visual Studio 2008 (9.0.x). - -(1) Create a folder named "contrib" in the directory where this text file is located. - -(2) Download the following libraries that rrdtool depends on into this folder: - - - cairo: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.8.10-3_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev_1.8.10-3_win32.zip - - - glib: http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.24/glib_2.24.1-1_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.24/glib-dev_2.24.1-1_win32.zip - - - libpng: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.0-1_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng-dev_1.4.0-1_win32.zip - - - libxml2: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libxml2_2.7.7-1_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libxml2-dev_2.7.7-1_win32.zip - - - pango: http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.0-1_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.0-1_win32.zip - - - zlib: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.4-2_win32.zip - and http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib-dev_1.2.4-2_win32.zip - - - fontconfig: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip - - - freetype: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.3.12-1_win32.zip - - - expat: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/expat_2.0.1-1_win32.zip - -(3) Extract all of the .zip files into the contrib folder. Do not extract each library into it's own - directory. We want all of the files merged into a structure consisting of "bin, include, lib..." - etc folders. - -(4) Open the Visual Studio 2008 Solution "rrd.sln" in the win32 folder of - your rrdtool-folder and build either the project rrdlib (for the - rrdtool-library), rrdtool (for the rrdtool-executable depending on the - libraray) or the complete solution. A post-build event automatically copies - all the dlls, needed by rrdtool, next to the .exe, when you build the - executable. These DLLs must be available on all hosts where rrdtool will - run. - -6/10/10 Chris -Updated project to include latest files and libraries. -Builds static or dynamic rrdlib - -5/1/05 Tobi -to help windows deal with the reentrant versions of many unix -calls link with win32comp.c - -4/10/05 Tobi -The windows implementation of strftime does not seem to support -the ISO 8601 week number (%V) I have therfore included the file -strftime.[ch] which provides strftime_ ... if you compile rrdtool -with -Dstrftime=_strftime and link strftime.o then you will -get propper support for %V. - -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 /* for off_t */ -# include /* for SEEK_* and off_t */ -# ifdef VMS -# include /* 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 /* for off_t */ -# include /* for SEEK_* and off_t */ -# ifdef VMS -# include /* 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-build -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 -may not be accurate at the time you are reading this. - -(1) freetype and rrdtool cannot use precompiled headers (which are -enabled by default for MSVC++ projects). MSVC++ 6.0 does not -support precompiled headers if #include directives contain MACROS. -(2) Compile Release build with Default optimization, not the -Maximize Speed optimization. I encountered some strange errors -(related to argument processing for complex commands like graph-- -perhaps the getopt stuff is too blame) with Maximize Speed. -(3) libart relies upon config.h (ostensibly generated by the -configure script-- but of course not on Win32 platforms). ..\..\confignt -(which contains a static Win32 version of config.h) should be on -the include path. -(4) Fonts are located in the %windir%\fonts, so the default font -is c:\winnt\fonts\cour.ttf. (6/19/02) At Kerry Calvert's suggestion -this setting was moved to confignt\config.h. -(5) libart requires a custom build step to generate art_config.h; this -is done manually via the commands: -cl -I..\..\confignt gen_art_config.c -gen_art_config.exe > art_config.h - -Currently, to compile rrd.lib and rrdtool.exe using -the MSVC++ project files, first start MSVC++ 6.0. Open the rrdtool -workspace (rrdtool.dsw in the src directory). The active project/ -configuration should be rrdtool-Win32 Release. Select Rebuild All -from the Build menu. The static link library (rrd.lib) will -be generated in src\release directory and executable will be generated -in the src\toolrelease directory. - -Compiling RRDtool on NT ... work in progress ---------------------------------------------------------------- - by Tamas Kovacshazy (khazy@mit.bme.hu) - -Persisting Problems with the current NT port: - -Unfortunately, the RRD perl modules does not work with Perl -(ActivePerl) using the current distribution. - -The RRD shared perl module can be compiled after some -modification... - -Follow these steps: - -0. Install perl if you do not have it! - Visit http://www.ActiveState.com/pw32/ for a complete distribution. - -1. Copy ..\gd1.2\release\gd.lib to ..\gd1.2\ -2. Copy ..\src\release\rrd.lib to ..\src -3. perl Makefile.pl - -In this step the system complains about something I do not -understand. The error message is the following: - -Note (probably harmless): No library found for '-lm' - -Is a library missing? But it does not stop with an error... - -4. nmake test (You must have Visual C++ on the machine!) - -After these steps it generates the test files (svgs and rrds), -and they seem to be good. - -The real problem in the shared perl modul is the following: - -I do not know how this installation stuff works. The problem is -that the installation stuff looks for the gd.lib and the -rrd.lib in the ..\gd1.2 and ..\src directory. The UNIX compile -puts the files into these directories, but the NT compile does -not. - -It is all for today, - -khazy - -Tamas Kovacshazy E-mail: khazy@mit.bme.hu -WWW: http://www.mit.bme.hu/~khazy -Technical University of Budapest -Department of Measurement and Information Systems - - -Compiling RRDtool 1.2.x on Win32 with MingW32 gcc: ---------------------------------------------------------------- - -1. Obtain and install the current version of the MingW package. - - http://www.mingw.org/download.shtml - - In the MinGW set you will need the gcc and binutils as a minimum. - -2. Obtain either of the following awk versions and install in a directory - on your System Path: - - - awk.exe - - http://cm.bell-labs.com/cm/cs/awkbook/index.html - - Note: This version has no dependencies to other libs. - - - gawk.exe (GnuWin32 version) - - http://gnuwin32.sourceforge.net/packages/gawk.htm - - Note: Also fetch the dependant libraries for it from the same page. - -3. If you plan to create a 'distribution' release of the RRD Tools, the - Makefile.Win32 will copy all the needed files to an output directory and - then zip the entire directory. A suitable zip utility can be obtained here: - - http://www.info-zip.org/ - - Install in a directory on your System Path. - -4. Obtain the following libraries, ideally install them all under a common - directory: - - = zlib - - http://oss.oetiker.ch/rrdtool/pub/libs/zlib-1.2.3.tar.gz - http://www.zlib.net/ - - = libpng - - http://oss.oetiker.ch/rrdtool/pub/libs/libpng-1.2.12.tar.gz - http://libpng.sourceforge.net/ - - = freetype - - http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.2.1.tar.gz - http://freetype.sourceforge.net/index2.html - - = libart_lgpl - - http://oss.oetiker.ch/rrdtool/pub/libs/libart_lgpl-2.3.17.tar.gz - http://www.levien.com/libart/ - - Note: libart_lgpl needs a special tweak because the archive contains - only the base directory, but the libart headers are usually included with - a directory prefix; therefore create a subfolder 'libart_lgpl' and move - all files into this subfolder. - -5. Set up for DOS environment. - - Add MingW\bin and MSYS\bin directories to your System path. - - If the libraries share a common directory set the following environment var: - - set LIBBASE= - e.g set LIBBASE=C:\Libraries - - If the libraries are scattered, set the following environment vers: - - set ZLIBSDK= - e.g set ZLIBSDK=C:\mytest\zlib-1.2.3 - set LIBPNG= - set LIBFT2= - set LIBART= - - If using the Gnu Awk (gawk.exe), edit the Makefile.Win32 and change the line: - - AWK = awk - - to - - AWK = gawk - -6. Compile the project. - - All dependent libs are statically linked in. This has the benefit that the - binaries do not depend on any other DLLs. - In order to build the static freetype lib enter the freetype base directory - and type 'make'. If everything is fine a message appears that gcc is detected, - and that you should again type 'make'. Follow that in order to build freetype. - All other libs are build from the sources with the RRDTool Makefile.Win32. - - Switch to the RRDTOOL .\src directory. Then: - - make -f Makefile.Win32 help - - to see the build options, or - - make -f Makefile.Win32 all - - should build the entire package. - -6. Happy Graphing! - - -written by normw & gk. - - diff --git a/win32/Makefile b/win32/Makefile deleted file mode 100644 index 8c392d55..00000000 --- a/win32/Makefile +++ /dev/null @@ -1,460 +0,0 @@ -# Gnu Makefile for Win32 target -# for use with MingW32 gcc or Metrowerks CodeWarrior compiler -# use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean] -# -# $id: $ -# - -DESCR = Round Robin Database Tool -COPYR = Copyright (c) 1997-2007 by Tobias Oetiker -WWWURL = http://www.rrdtool.org/ -ICON = $(PROOT)/favicon.ico - -# You can set the default font used in graphs. -# If not set here RRD defaults to DejaVuSansMono-Roman.ttf -#RRD_DEFAULT_FONT = "arial.ttf" -#RRD_DEFAULT_FONT = "VeraMono.ttf" - -# Vertical label angle: 90.0 (default) or 270.0 -RRDGRAPH_YLEGEND_ANGLE = 90.0 - -# Set to one if you want to have piecharts. -WITH_PIECHART = 0 - -# Set the extension used for rrdcgi. -ifndef CGIEXT -CGIEXT = exe -endif - -# Base for the lib sources -ifndef LIBBASE -LIBBASE = ../.. -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.16 -endif -# Edit the path below to point to your freetype sources or set environment var. -ifndef LIBFT2 -#LIBFT2 = $(LIBBASE)/freetype-2.3.4 -LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.4 -endif -# Edit the path below to point to your libart sources or set environment var. -ifndef LIBART -LIBART = $(LIBBASE)/libart_lgpl-2.3.17 -endif -# Edit the path below to point to your zlib sources or set environment var. -ifndef ZLIBSDK -ZLIBSDK = $(LIBBASE)/zlib-1.2.3 -endif - -# Edit the path below to point to your distribution folder. -ifndef DISTDIR -DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32 -endif -DISTARC = $(DISTDIR).zip - -# Edit the path below to point to your distribution folder. -ifndef DEVLDIR -DEVLDIR = rrdtool-$(RRD_VERSION_STR)-sdk-w32 -endif -DEVLARC = $(DEVLDIR).zip - -# whatever... -NO_NULL_REALLOC = 1 - -# The following line defines your compiler. -ifdef METROWERKS - CC = mwcc -else - CC = gcc -endif -# RM = rm -f -CP = cp -afv -# Here you can find a native Win32 binary of the original awk: -# http://www.gknw.net/development/prgtools/awk.zip -AWK = awk -ZIP = zip -qzr9 - -# must be equal to DEBUG or NDEBUG -DB = NDEBUG -# DB = DEBUG -# Optimization: -O or debugging: -g -ifeq ($(DB),NDEBUG) - OPT = -O2 - OBJDIR = release -else - OPT = -g - OBJDIR = debug -endif - -# Project root -PROOT = .. - -# Include the version info retrieved from source. --include $(OBJDIR)/version.inc - -# Global flags for all compilers -CFLAGS = $(OPT) -D$(DB) -DHAVE_CONFIG_H - -ifeq ($(CC),mwcc) -LD = mwld -RC = mwwinrc -LDFLAGS = -nostdlib -AR = $(LD) -ARFLAGS = -type library -w nocmdline $(OBJS) -o -LIBEXT = lib -LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support" -LDLIBS += -lkernel32.lib -luser32.lib -LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib -RCFLAGS = -CFLAGS += -DWIN32 -CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586 -CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support" -CFLAGS += -w on,nounused,nounusedexpr # -ansi strict -else -LD = gcc -RC = windres -LDFLAGS = -s -AR = ar -ARFLAGS = -cq -LIBEXT = a -RCFLAGS = -O coff -i -CFLAGS += -fno-strict-aliasing -CFLAGS += -Wall -Wno-unused # -pedantic -endif - -ifeq ($(findstring msys,$(OSTYPE)),msys) -DL = ' -DS = / -else -DS = \\ -endif - -ifndef DESCR - DESCR = $(notdir $(@:.rc=)) Command Extension -endif -DESCR += - $(CC) build - -INCLUDES += -I$(PROOT) -I$(PROOT)/src -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK) - -CFLAGS += $(INCLUDES) - -vpath %.c $(PROOT)/src $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) - -RRDLIBOBJS = \ - $(OBJDIR)/rrd_afm.o \ - $(OBJDIR)/rrd_afm_data.o \ - $(OBJDIR)/rrd_create.o \ - $(OBJDIR)/rrd_diff.o \ - $(OBJDIR)/rrd_dump.o \ - $(OBJDIR)/rrd_error.o \ - $(OBJDIR)/rrd_fetch.o \ - $(OBJDIR)/rrd_first.o \ - $(OBJDIR)/rrd_format.o \ - $(OBJDIR)/rrd_gfx.o \ - $(OBJDIR)/rrd_graph.o \ - $(OBJDIR)/rrd_graph_helper.o \ - $(OBJDIR)/rrd_hw.o \ - $(OBJDIR)/rrd_info.o \ - $(OBJDIR)/rrd_last.o \ - $(OBJDIR)/rrd_lastupdate.o \ - $(OBJDIR)/rrd_nan_inf.o \ - $(OBJDIR)/rrd_open.o \ - $(OBJDIR)/rrd_resize.o \ - $(OBJDIR)/rrd_restore.o \ - $(OBJDIR)/rrd_rpncalc.o \ - $(OBJDIR)/rrd_tune.o \ - $(OBJDIR)/rrd_update.o \ - $(OBJDIR)/rrd_version.o \ - $(OBJDIR)/rrd_xport.o \ - $(OBJDIR)/rrd_thread_safe_nt.o \ - $(EOLIST) - -XLIBOBJS = \ - $(OBJDIR)/rrd_getopt.o \ - $(OBJDIR)/rrd_getopt1.o \ - $(OBJDIR)/art_rgba_svp.o \ - $(OBJDIR)/hash_32.o \ - $(OBJDIR)/parsetime.o \ - $(OBJDIR)/pngsize.o \ - $(OBJDIR)/strftime.o \ - $(EOLIST) - -PNGLIBOBJS = \ - $(OBJDIR)/png.o \ - $(OBJDIR)/pngerror.o \ - $(OBJDIR)/pngget.o \ - $(OBJDIR)/pngmem.o \ - $(OBJDIR)/pngpread.o \ - $(OBJDIR)/pngread.o \ - $(OBJDIR)/pngrio.o \ - $(OBJDIR)/pngrtran.o \ - $(OBJDIR)/pngrutil.o \ - $(OBJDIR)/pngset.o \ - $(OBJDIR)/pngtrans.o \ - $(OBJDIR)/pngwio.o \ - $(OBJDIR)/pngwrite.o \ - $(OBJDIR)/pngwtran.o \ - $(OBJDIR)/pngwutil.o \ - $(EOLIST) -ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c" -PNGLIBOBJS += \ - $(OBJDIR)/pnggccrd.o \ - $(OBJDIR)/pngvcrd.o \ - $(EOLIST) -endif - -ZLIBOBJS = \ - $(OBJDIR)/adler32.o \ - $(OBJDIR)/compress.o \ - $(OBJDIR)/crc32.o \ - $(OBJDIR)/deflate.o \ - $(OBJDIR)/inflate.o \ - $(OBJDIR)/inffast.o \ - $(OBJDIR)/inftrees.o \ - $(OBJDIR)/trees.o \ - $(OBJDIR)/zutil.o \ - $(EOLIST) -ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c" -ZLIBOBJS += \ - $(OBJDIR)/infblock.o \ - $(OBJDIR)/infcodes.o \ - $(OBJDIR)/infutil.o \ - $(EOLIST) -endif - -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 += $(LIBFT2)/objs/freetype.$(LIBEXT) - - -all: rrdtool rrdcgi - -rrdtool: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdtool.exe -rrdcgi: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdcgi.$(CGIEXT) -librrd: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/librrd.$(LIBEXT) - -FORCE: ; - -dist: all $(DISTDIR) $(DISTDIR)/readme.txt - @-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR) - @-$(CP) $(OBJDIR)/rrdtool.exe $(DISTDIR) - @-$(CP) $(PROOT)/src/*.ttf $(DISTDIR) - @-$(CP) $(PROOT)/CHANGES $(DISTDIR) - @-$(CP) $(PROOT)/COPYING $(DISTDIR) - @-$(CP) $(PROOT)/COPYRIGHT $(DISTDIR) - @-$(CP) $(PROOT)/NEWS $(DISTDIR) - @-$(CP) $(PROOT)/README $(DISTDIR) - @echo Creating $(DISTARC) - @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt - -dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt - @-mkdir $(DEVLDIR)$(DS)include - @-mkdir $(DEVLDIR)$(DS)lib - @-mkdir $(DEVLDIR)$(DS)src - @-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DEVLDIR)/lib - @-$(CP) $(PROOT)/rrd_config.h $(DEVLDIR)/include - @-$(CP) $(PROOT)/src/rrd.h $(DEVLDIR)/include - @-$(CP) $(PROOT)/src/*.ttf $(DEVLDIR)/src - @-$(CP) $(PROOT)/CHANGES $(DEVLDIR) - @-$(CP) $(PROOT)/COPYING $(DEVLDIR) - @-$(CP) $(PROOT)/COPYRIGHT $(DEVLDIR) - @-$(CP) $(PROOT)/NEWS $(DEVLDIR) - @-$(CP) $(PROOT)/README $(DEVLDIR) - @echo Creating $(DEVLARC) - @$(ZIP) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt - -clean: - -$(RM) -r $(OBJDIR) - -$(RM) $(PROOT)/rrd_config.h - -distclean: clean - -$(RM) -r $(DISTDIR) - -$(RM) $(DISTARC) - -devclean: clean - -$(RM) -r $(DEVLDIR) - -$(RM) $(DEVLARC) - -$(OBJDIR): - @mkdir $@ - -$(DISTDIR): - @mkdir $@ - -$(DEVLDIR): - @mkdir $@ - -$(OBJDIR)/version.inc: $(PROOT)/configure.ac $(OBJDIR) $(PROOT)/src/get_ver.awk - @echo Creating $@ - @$(AWK) -f $(PROOT)/src/get_ver.awk $< > $@ - -$(OBJDIR)/%.o: %.c - @echo Compiling $< - @$(CC) $(CFLAGS) -c $< -o $@ - -$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.res - @echo Linking $@ - @-$(RM) $@ - @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS) - -$(OBJDIR)/rrdtool.exe: $(OBJTOOL) $(OBJDIR)/rrdtool.res - @echo Linking $@ - @-$(RM) $@ - @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS) - -$(OBJDIR)/librrd.$(LIBEXT): $(OBJS) - @echo Creating $@ - @-$(RM) $@ - @$(AR) $(ARFLAGS) $@ $^ - -$(OBJDIR)/%.res: $(OBJDIR)/%.rc - @echo Creating $@ - @$(RC) $(RCFLAGS) $< -o $@ - -$(OBJDIR)/%.rc: Makefile $(OBJDIR)/version.inc - @echo $(DL)1 VERSIONINFO$(DL) > $@ - @echo $(DL) FILEVERSION $(RRD_VERSION),0$(DL) >> $@ - @echo $(DL) PRODUCTVERSION $(RRD_VERSION),0$(DL) >> $@ - @echo $(DL) FILEFLAGSMASK 0x3fL$(DL) >> $@ - @echo $(DL) FILEOS 0x40004L$(DL) >> $@ - @echo $(DL) FILEFLAGS 0x0L$(DL) >> $@ - @echo $(DL) FILETYPE 0x1L$(DL) >> $@ - @echo $(DL) FILESUBTYPE 0x0L$(DL) >> $@ - @echo $(DL)BEGIN$(DL) >> $@ - @echo $(DL) BLOCK "StringFileInfo"$(DL) >> $@ - @echo $(DL) BEGIN$(DL) >> $@ - @echo $(DL) BLOCK "040904E4"$(DL) >> $@ - @echo $(DL) BEGIN$(DL) >> $@ - @echo $(DL) VALUE "LegalCopyright","$(COPYR)\0"$(DL) >> $@ -ifdef COMPANY - @echo $(DL) VALUE "CompanyName","$(COMPANY)\0"$(DL) >> $@ -endif - @echo $(DL) VALUE "ProductName","$(notdir $(@:.rc=.exe))\0"$(DL) >> $@ - @echo $(DL) VALUE "ProductVersion","$(RRD_VERSION_STR)\0"$(DL) >> $@ - @echo $(DL) VALUE "License","Released under GPL.\0"$(DL) >> $@ - @echo $(DL) VALUE "FileDescription","$(DESCR)\0"$(DL) >> $@ - @echo $(DL) VALUE "FileVersion","$(RRD_VERSION_STR)\0"$(DL) >> $@ - @echo $(DL) VALUE "InternalName","$(notdir $(@:.rc=))\0"$(DL) >> $@ - @echo $(DL) VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0"$(DL) >> $@ - @echo $(DL) VALUE "WWW","$(WWWURL)\0"$(DL) >> $@ - @echo $(DL) END$(DL) >> $@ - @echo $(DL) END$(DL) >> $@ - @echo $(DL) BLOCK "VarFileInfo"$(DL) >> $@ - @echo $(DL) BEGIN$(DL) >> $@ - @echo $(DL) VALUE "Translation", 0x409, 1252$(DL) >> $@ - @echo $(DL) END$(DL) >> $@ - @echo $(DL)END$(DL) >> $@ -ifdef ICON - @echo $(DL)10 ICON DISCARDABLE "$(ICON)"$(DL) >> $@ -endif - -$(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc - @echo Creating $@ - @echo $(DL)/* $(notdir $@) for Win32 target.$(DL) > $@ - @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ - @echo $(DL)** All your changes will be lost!!$(DL) >> $@ - @echo $(DL)*/$(DL) >> $@ - @echo $(DL)#ifndef WIN32$(DL) >> $@ - @echo $(DL)#error This $(notdir $@) is created for Win32 platform!$(DL) >> $@ - @echo $(DL)#endif$(DL) >> $@ - @echo $(DL)#ifndef RRD_CONFIG_H$(DL) >> $@ - @echo $(DL)#define RRD_CONFIG_H$(DL) >> $@ - @echo $(DL)#define OS "i586-pc-Win32"$(DL) >> $@ - @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@ - @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@ - @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@ - @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@ - @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@ - @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_LIMITS_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ - @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@ - @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@ - @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_STDDEF_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@ - @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_TIME_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) >> $@ - @echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@ -ifdef NO_NULL_REALLOC - @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@ - @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@ -else - @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@ -endif -ifdef RRD_DEFAULT_FONT - @echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@ -endif - @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@ - @echo $(DL)#define strftime strftime_$(DL) >> $@ -ifdef WITH_PIECHART - @echo $(DL)#define WITH_PIECHART $(WITH_PIECHART)$(DL) >> $@ -endif - @echo $(DL)#endif /* RRD_CONFIG_H */$(DL) >> $@ - -$(DISTDIR)/readme.txt: Makefile - @echo Creating $@ - @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@ - @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@ - @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@ - @echo $(DL)any further documentation:$(DL) >> $@ - @echo $(DL)$(WWWURL)$(DL) >> $@ - -$(DEVLDIR)/readme.txt: Makefile - @echo Creating $@ - @echo $(DL)This is a development distribution for Win32 platform.$(DL) > $@ - @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@ - @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@ - @echo $(DL)any further documentation:$(DL) >> $@ - @echo $(DL)$(WWWURL)$(DL) >> $@ - -help: - @echo $(DL)===========================================================$(DL) - @echo $(DL)libpng Source = $(LIBPNG)$(DL) - @echo $(DL)libart Source = $(LIBART)$(DL) - @echo $(DL)Freetype 2 SDK = $(LIBFT2)$(DL) - @echo $(DL)Zlib SDK = $(ZLIBSDK)$(DL) - @echo $(DL)===========================================================$(DL) - @echo $(DL)RRDTool $(RRD_VERSION_STR) - available targets are:$(DL) - @echo $(DL)$(MAKE) all$(DL) - @echo $(DL)$(MAKE) rrdtool$(DL) - @echo $(DL)$(MAKE) rrdcgi$(DL) - @echo $(DL)$(MAKE) librrd$(DL) - @echo $(DL)$(MAKE) clean$(DL) - @echo $(DL)$(MAKE) dev$(DL) - @echo $(DL)$(MAKE) devclean$(DL) - @echo $(DL)$(MAKE) dist$(DL) - @echo $(DL)$(MAKE) distclean$(DL) - @echo $(DL)===========================================================$(DL) - - diff --git a/win32/README b/win32/README index 612c0786..238c605c 100755 --- a/win32/README +++ b/win32/README @@ -1,11 +1,28 @@ Win32 Build Instructions: -1) Make sure that the contrib file has all the required files for RRDtool -2) Open rrd.sln from Visual Studio -3) Select the 'Release' Build Type -4) Build the Solution -5) rrdtool.exe, and rrdupdate.exe will be located in the Release directory -6) To install, copy the two binaries, along with the host of DLL files to - their permanent location -7) To build the ActiveState perl module. Follow the instructions under - the README file under 'binding/perl-shared' +1) See build-rrdtool.dot (build-rrdtool.svg or build-rrdtool.pdf) for build + dependency. + +2) If you do not want to build the build-dependencies, you can download these + software from the following address: + + http://ftp.gnome.org/pub/gnome/binaries/win32/ + http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/ + + http://ftp.gnome.org/pub/gnome/binaries/win64/ + http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/ + +3) Adjust the include path, library path, and library names which in the + Makefile.msc, to correspond with your local path or names. + +4) Run 'nmake -f win32\Makefile.msc' for 32 bit Windows target, + Run 'nmake -f win32\Makefile.msc USE_64BIT=1' for 64 bit Windows target. + Run 'nmake -f win32\Makefile.msc clean' to remove all generated files. + +5) librrd-4.dll, librrd-4.lib, rrdtool.exe, rrdupdate.exe, rrdcgi.exe, and + these corresponding pdb files will be located in the win32 directory. + +6) To install, copy these files which you required to their permanent location. + +7) To build the binding module. Follow the instructions in the README file which + under the subdirectory of 'binding/'. diff --git a/win32/config.h b/win32/config.h deleted file mode 100644 index 587d02e6..00000000 --- a/win32/config.h +++ /dev/null @@ -1,62 +0,0 @@ -/* config.h.msvc. Hand-tweaked config.h for MSVC compiler. */ -#ifndef CONFIG_H -#define CONFIG_H - -#include -#include -#include -#include -#include - -/* realloc does not support NULL as argument */ - -#define HAVE_STRFTIME 1 -#define HAVE_TIME_H 1 -#define HAVE_LOCALE_H 1 -#define HAVE_TZSET 1 -#define HAVE_SETLOCALE 1 -#define HAVE_MATH_H 1 -#define HAVE_FLOAT_H 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MALLOC_H 1 -#define HAVE_MKTIME 1 -#define HAVE_STRFTIME 1 -#define HAVE_STRING_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_RRD_GRAPH 1 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -#define NUMVERS 1.4050 -#define PACKAGE_NAME "rrdtool" -#define PACKAGE_VERSION "1.4.5" -#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION - -#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF) -#define isnan _isnan -#define finite _finite -#define snprintf _snprintf -//#define vsnprintf _vsnprintf -//#define strftime strftime_ - -#define NO_NULL_REALLOC 1 -#if NO_NULL_REALLOC -# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) )) -#else -# define rrd_realloc(a,b) realloc((a), (b)) -#endif - -/* Vertical label angle: 90.0 (default) or 270.0 */ -#define RRDGRAPH_YLEGEND_ANGLE 90.0 - -#define RRD_DEFAULT_FONT "Courier" - -/* #define DEBUG 1 */ - -__inline int round(double a){int x = (a + 0.5); return x;} - -#endif /* CONFIG_H */ diff --git a/win32/rrd.sln b/win32/rrd.sln deleted file mode 100644 index 59660f7a..00000000 --- a/win32/rrd.sln +++ /dev/null @@ -1,52 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdlib", "rrdlib.vcproj", "{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}" - ProjectSection(ProjectDependencies) = postProject - {11CD05F8-E5E1-476E-A75F-A112655D4E94} = {11CD05F8-E5E1-476E-A75F-A112655D4E94} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - DebugDLL|Win32 = DebugDLL|Win32 - Release|Win32 = Release|Win32 - ReleaseDLL|Win32 = ReleaseDLL|Win32 - Static Debug|Win32 = Static Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.ActiveCfg = Debug|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|Win32.Build.0 = Debug|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.ActiveCfg = Release|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|Win32.Build.0 = Release|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.ActiveCfg = Static Debug|Win32 - {CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|Win32.Build.0 = Static Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|Win32.ActiveCfg = Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.ReleaseDLL|Win32.ActiveCfg = Release|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.ActiveCfg = Static Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|Win32.Build.0 = Static Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.Build.0 = Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.DebugDLL|Win32.ActiveCfg = Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.ActiveCfg = Release|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.Build.0 = Release|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.ReleaseDLL|Win32.ActiveCfg = Release|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|Win32.ActiveCfg = Static Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|Win32.Build.0 = Static Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/rrdlib.vcproj b/win32/rrdlib.vcproj deleted file mode 100644 index bf53b39c..00000000 --- a/win32/rrdlib.vcproj +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/rrdtool.sln b/win32/rrdtool.sln deleted file mode 100755 index 3212f227..00000000 --- a/win32/rrdtool.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32 - {11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/rrdtool.vcproj b/win32/rrdtool.vcproj deleted file mode 100644 index e434a4a3..00000000 --- a/win32/rrdtool.vcproj +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/rrdupdate.sln b/win32/rrdupdate.sln deleted file mode 100755 index af71e464..00000000 --- a/win32/rrdupdate.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.Build.0 = Debug|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.ActiveCfg = Release|Win32 - {3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/rrdupdate.vcproj b/win32/rrdupdate.vcproj deleted file mode 100755 index 1e505b6b..00000000 --- a/win32/rrdupdate.vcproj +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -