From 38a4b58a9749f17e19303b05b8919b5c1b73b59f Mon Sep 17 00:00:00 2001 From: jake Date: Wed, 16 Jul 2003 23:41:37 +0000 Subject: [PATCH] Updated MS Visual C++ files from 7.0 to 7.1. Add code to rrd_graph.c: rrd_graph_init() to use %windir% environment variable to find the default font at runtime. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@209 a5681a0c-68f1-0310-ab6d-d61299d08faa --- confignt/config.h | 12 +- libraries/cgilib-0.4/cgilib.vcproj | 99 ++- libraries/freetype-2.0.5/freetype.vcproj | 1103 ++++++++++++++++++++++++++--- libraries/libart_lgpl-2.3.7/libart.vcproj | 779 ++++++++++++++++++-- libraries/libpng-1.2.0/png.vcproj | 177 +++-- libraries/zlib-1.1.4/zlib.vcproj | 167 ++++- src/rrd.vcproj | 525 +++++++++++++- src/rrd_cgi.vcproj | 63 +- src/rrd_graph.c | 23 +- src/rrdtool.sln | 121 ++-- src/rrdtool.vcproj | 61 +- 11 files changed, 2740 insertions(+), 390 deletions(-) diff --git a/confignt/config.h b/confignt/config.h index f31bba1..9ffb77e 100644 --- a/confignt/config.h +++ b/confignt/config.h @@ -14,6 +14,12 @@ #define rrd_realloc(a,b) realloc((a), (b)) #define snprintf _snprintf - -/* change this to %windir%/fonts */ -#define RRD_DEFAULT_FONT "c:/winnt/fonts/cour.ttf" +/* Code in rrd_graph.c:rrd_graph_init() uses the %windir% + * environment variable to override this. This should + * avoid the recompile problem if the system directory is + * c:/windows vs. d:/winnt. + * This #define can't be removed because: + * (1) the constant is used outside of rrd_graph_init() to init a struct + * (2) windir might not be available in all environments + */ +#define RRD_DEFAULT_FONT "c:/windows/fonts/cour.ttf" diff --git a/libraries/cgilib-0.4/cgilib.vcproj b/libraries/cgilib-0.4/cgilib.vcproj index 3f918bc..08edb57 100644 --- a/libraries/cgilib-0.4/cgilib.vcproj +++ b/libraries/cgilib-0.4/cgilib.vcproj @@ -1,7 +1,7 @@ - + @@ -11,34 +11,34 @@ @@ -50,41 +50,46 @@ Name="VCPreLinkEventTool"/> + + + @@ -96,18 +101,44 @@ Name="VCPreLinkEventTool"/> + + + + + + RelativePath="cgi.c"> + + + + + + + @@ -11,33 +11,31 @@ @@ -49,38 +47,46 @@ Name="VCPreLinkEventTool"/> + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="include"/> + + + @@ -92,187 +98,1106 @@ Name="VCPreLinkEventTool"/> + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + + + + + + RelativePath="ahangles.c"> + + + + + + + RelativePath="ahglobal.c"> + + + + + + + RelativePath="ahglyph.c"> + + + + + + + RelativePath="ahhint.c"> + + + + + + + RelativePath="ahmodule.c"> + + + + + + + RelativePath="cff.c"> + + + + + + + RelativePath="cidgload.c"> + + + + + + + RelativePath="cidload.c"> + + + + + + + RelativePath="cidobjs.c"> + + + + + + + RelativePath="cidparse.c"> + + + + + + + RelativePath="cidriver.c"> + + + + + + + RelativePath="ftcalc.c"> + + + + + + + RelativePath="ftcchunk.c"> + + + + + + + RelativePath="ftcglyph.c"> + + + + + + + RelativePath="ftcimage.c"> + + + + + + + RelativePath="ftcmanag.c"> + + + + + + + RelativePath="ftcsbits.c"> + + + + + + + RelativePath="ftextend.c"> + + + + + + + RelativePath="ftglyph.c"> + + + + + + + RelativePath="ftgrays.c"> + + + + + + + RelativePath="ftinit.c"> + + + + + + + RelativePath="ftlist.c"> + + + + + + + RelativePath="ftlru.c"> + + + + + + + RelativePath="ftnames.c"> + + + + + + + RelativePath="ftobjs.c"> + + + + + + + RelativePath="ftoutln.c"> + + + + + + + RelativePath="ftraster.c"> + + + + + + + RelativePath="ftrend1.c"> + + + + + + + RelativePath="ftsmooth.c"> + + + + + + + RelativePath="ftstream.c"> + + + + + + + RelativePath="ftsystem.c"> + + + + + + + RelativePath="fttrigon.c"> + + + + + + + RelativePath="pcfdriver.c"> + + + + + + + RelativePath="pcfread.c"> + + + + + + + RelativePath="pcfutil.c"> + + + + + + + RelativePath="psauxmod.c"> + + + + + + + RelativePath="psmodule.c"> + + + + + + + RelativePath="psobjs.c"> + + + + + + + RelativePath="sfdriver.c"> + + + + + + + RelativePath="sfobjs.c"> + + + + + + + RelativePath="t1afm.c"> + + + + + + + RelativePath="t1decode.c"> + + + + + + + RelativePath="t1driver.c"> + + + + + + + RelativePath="t1gload.c"> + + + + + + + RelativePath="t1load.c"> + + + + + + + RelativePath="t1objs.c"> + + + + + + + RelativePath="t1parse.c"> + + + + + + + RelativePath="ttcmap.c"> + + + + + + + RelativePath="ttdriver.c"> + + + + + + + RelativePath="ttgload.c"> + + + + + + + RelativePath="ttinterp.c"> + + + + + + + RelativePath="ttload.c"> + + + + + + + RelativePath="ttobjs.c"> + + + + + + + RelativePath="ttpload.c"> + + + + + + + RelativePath="ttpost.c"> + + + + + + + RelativePath="ttsbit.c"> + + + + + + + RelativePath="winfnt.c"> + + + + + + + @@ -11,33 +11,34 @@ @@ -49,40 +50,44 @@ Name="VCPreLinkEventTool"/> + + + @@ -94,134 +99,750 @@ Name="VCPreLinkEventTool"/> + + + + + + RelativePath="art_affine.c"> + + + + + + + RelativePath="art_alphagamma.c"> + + + + + + + RelativePath="art_bpath.c"> + + + + + + + RelativePath="art_gray_svp.c"> + + + + + + + RelativePath="art_misc.c"> + + + + + + + RelativePath="art_pixbuf.c"> + + + + + + + RelativePath="art_rect.c"> + + + + + + + RelativePath="art_rect_svp.c"> + + + + + + + RelativePath="art_rect_uta.c"> + + + + + + + RelativePath="art_render.c"> + + + + + + + RelativePath="art_render_gradient.c"> + + + + + + + RelativePath="art_render_svp.c"> + + + + + + + RelativePath="art_rgb.c"> + + + + + + + RelativePath="art_rgb_a_affine.c"> + + + + + + + RelativePath="art_rgb_affine.c"> + + + + + + + RelativePath="art_rgb_affine_private.c"> + + + + + + + RelativePath="art_rgb_bitmap_affine.c"> + + + + + + + RelativePath="art_rgb_pixbuf_affine.c"> + + + + + + + RelativePath="art_rgb_rgba_affine.c"> + + + + + + + RelativePath="art_rgb_svp.c"> + + + + + + + RelativePath="art_rgba.c"> + + + + + + + RelativePath="art_svp.c"> + + + + + + + RelativePath="art_svp_intersect.c"> + + + + + + + RelativePath="art_svp_ops.c"> + + + + + + + RelativePath="art_svp_point.c"> + + + + + + + RelativePath="art_svp_render_aa.c"> + + + + + + + RelativePath="art_svp_vpath.c"> + + + + + + + RelativePath="art_svp_vpath_stroke.c"> + + + + + + + RelativePath="art_svp_wind.c"> + + + + + + + RelativePath="art_uta.c"> + + + + + + + RelativePath="art_uta_ops.c"> + + + + + + + RelativePath="art_uta_rect.c"> + + + + + + + RelativePath="art_uta_svp.c"> + + + + + + + RelativePath="art_uta_vpath.c"> + + + + + + + RelativePath="art_vpath.c"> + + + + + + + RelativePath="art_vpath_bpath.c"> + + + + + + + RelativePath="art_vpath_dash.c"> + + + + + + + RelativePath="art_vpath_svp.c"> + + + + + + + RelativePath="gen_art_config.c"> + Name="Debug|Win32"> + Name="Release|Win32"> + RelativePath="libart-features.c"> + + + + + + + @@ -22,9 +22,9 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\zlib-1.1.3" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" BasicRuntimeChecks="3" - RuntimeLibrary="4" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/png.pch" AssemblerListingLocation=".\Debug/" @@ -54,6 +54,12 @@ Culture="1033"/> + + + + + + + + + RelativePath="png.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngerror.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngget.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngmem.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngpread.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngread.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngrio.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngrtran.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngrutil.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngset.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngtrans.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngwio.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngwrite.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngwtran.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> + RelativePath="pngwutil.c"> + Optimization="0" + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + AdditionalIncludeDirectories="..\zlib-1.1.4;$(NoInherit)" + PreprocessorDefinitions=""/> diff --git a/libraries/zlib-1.1.4/zlib.vcproj b/libraries/zlib-1.1.4/zlib.vcproj index 02951ef..f84eb2f 100644 --- a/libraries/zlib-1.1.4/zlib.vcproj +++ b/libraries/zlib-1.1.4/zlib.vcproj @@ -1,7 +1,7 @@ - + @@ -21,9 +21,9 @@ + + + + + + + + + RelativePath="adler32.c"> + + + + RelativePath="compress.c"> + + + + RelativePath="crc32.c"> + + + + RelativePath="deflate.c"> + + + + RelativePath="gzio.c"> + + + + RelativePath="infblock.c"> + + + + RelativePath="infcodes.c"> + + + + RelativePath="inffast.c"> + + + + RelativePath="inflate.c"> + + + + RelativePath="inftrees.c"> + + + + RelativePath="infutil.c"> + + + + RelativePath="trees.c"> + + + + RelativePath="uncompr.c"> + + + + RelativePath="zutil.c"> + + + + @@ -20,10 +20,9 @@ CharacterSet="2"> + + + + + + + + + RelativePath="getopt.c"> + + + + + + + RelativePath="getopt1.c"> + + + + + + + RelativePath="hash_32.c"> + + + + + + + RelativePath="parsetime.c"> + + + + + + + RelativePath="pngsize.c"> + + + + + + + RelativePath="rrd_afm.c"> + + + + + + + RelativePath="rrd_afm_data.c"> + + + + + + + RelativePath="rrd_create.c"> + + + + + + + RelativePath="rrd_diff.c"> + + + + + + + RelativePath="rrd_dump.c"> + + + + + + + RelativePath="rrd_error.c"> + + + + + + + RelativePath="rrd_fetch.c"> + + + + + + + RelativePath="rrd_format.c"> + + + + + + + RelativePath="rrd_gfx.c"> + + + + + + + RelativePath="rrd_graph.c"> + + + + + + + RelativePath="rrd_graph_helper.c"> + + + + + + + RelativePath="rrd_hw.c"> + + + + + + + RelativePath="rrd_info.c"> + + + + + + + RelativePath="rrd_last.c"> + + + + + + + + + + + + + RelativePath="rrd_open.c"> + + + + + + + RelativePath="rrd_resize.c"> + + + + + + + RelativePath="rrd_restore.c"> + + + + + + + RelativePath="rrd_rpncalc.c"> + + + + + + + + + + + + + RelativePath="rrd_tune.c"> + + + + + + + RelativePath="rrd_update.c"> + + + + + + + RelativePath="rrd_xport.c"> + + + + + + diff --git a/src/rrd_cgi.vcproj b/src/rrd_cgi.vcproj index 5aa7324..e90ce38 100644 --- a/src/rrd_cgi.vcproj +++ b/src/rrd_cgi.vcproj @@ -1,7 +1,7 @@ - + @@ -22,7 +22,7 @@ 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" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\rrd_cgi_Debug/rrd_cgi.pch" @@ -38,17 +38,18 @@ Name="VCCustomBuildTool"/> + SubSystem="1" + TargetMachine="1"/> + TypeLibraryName=".\rrd_cgi_Debug/rrd_cgi.tlb" + HeaderFileName=""/> + + + + SubSystem="1" + TargetMachine="1"/> + TypeLibraryName=".\rrd_cgi_Release/rrd_cgi.tlb" + HeaderFileName=""/> + + + + + + RelativePath="rrd_cgi.c"> + + + + + + graph_col[i]=graph_col[i]; - +#ifdef WIN32 + { + char *windir; + windir = getenv("windir"); + /* %windir% is something like D:\windows or C:\winnt */ + if (windir != NULL) { + strcpy(rrd_win_default_font,windir); + strcat(rrd_win_default_font,"\\fonts\\cour.ttf"); + for(i=0;itext_prop[i].size = text_prop[i].size; im->text_prop[i].font = text_prop[i].font; diff --git a/src/rrdtool.sln b/src/rrdtool.sln index 3590d2e..765b1a4 100644 --- a/src/rrdtool.sln +++ b/src/rrdtool.sln @@ -1,68 +1,83 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgilib", "..\libraries\cgilib-0.4\cgilib.vcproj", "{6FCA5C40-1E61-4300-A1FE-9049431D0C3A}" +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}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\libraries\freetype-2.0.5\freetype.vcproj", "{007876D2-D817-4538-984E-9B5233A0D5A5}" +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", "{CB6900E7-9BF3-488E-B6C9-349BC7332963}" +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", "{8C48C30B-375A-42D6-B149-AFE4C62B1A14}" +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", "{FB9BF183-F75B-462C-9A5F-988D5E2E1C11}" +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", "{DA26770C-AFF6-450E-93EC-392723C173FC}" +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", "{99D7F83E-16F1-4C25-999A-C844E6D2A68B}" +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", "{5E240333-1205-4404-98F3-8A4061046DA8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\libraries\zlib-1.1.4\zlib.vcproj", "{10442D5F-AB42-4DE2-B023-0621C8246933}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - {8C48C30B-375A-42D6-B149-AFE4C62B1A14}.0 = {5E240333-1205-4404-98F3-8A4061046DA8} - {DA26770C-AFF6-450E-93EC-392723C173FC}.0 = {FB9BF183-F75B-462C-9A5F-988D5E2E1C11} - {DA26770C-AFF6-450E-93EC-392723C173FC}.1 = {6FCA5C40-1E61-4300-A1FE-9049431D0C3A} - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.0 = {5E240333-1205-4404-98F3-8A4061046DA8} - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.1 = {8C48C30B-375A-42D6-B149-AFE4C62B1A14} - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.2 = {CB6900E7-9BF3-488E-B6C9-349BC7332963} - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.3 = {007876D2-D817-4538-984E-9B5233A0D5A5} - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.4 = {FB9BF183-F75B-462C-9A5F-988D5E2E1C11} + Debug = Debug + Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {6FCA5C40-1E61-4300-A1FE-9049431D0C3A}.Debug.ActiveCfg = Debug|Win32 - {6FCA5C40-1E61-4300-A1FE-9049431D0C3A}.Debug.Build.0 = Debug|Win32 - {6FCA5C40-1E61-4300-A1FE-9049431D0C3A}.Release.ActiveCfg = Release|Win32 - {6FCA5C40-1E61-4300-A1FE-9049431D0C3A}.Release.Build.0 = Release|Win32 - {007876D2-D817-4538-984E-9B5233A0D5A5}.Debug.ActiveCfg = Debug|Win32 - {007876D2-D817-4538-984E-9B5233A0D5A5}.Debug.Build.0 = Debug|Win32 - {007876D2-D817-4538-984E-9B5233A0D5A5}.Release.ActiveCfg = Release|Win32 - {007876D2-D817-4538-984E-9B5233A0D5A5}.Release.Build.0 = Release|Win32 - {CB6900E7-9BF3-488E-B6C9-349BC7332963}.Debug.ActiveCfg = Debug|Win32 - {CB6900E7-9BF3-488E-B6C9-349BC7332963}.Debug.Build.0 = Debug|Win32 - {CB6900E7-9BF3-488E-B6C9-349BC7332963}.Release.ActiveCfg = Release|Win32 - {CB6900E7-9BF3-488E-B6C9-349BC7332963}.Release.Build.0 = Release|Win32 - {8C48C30B-375A-42D6-B149-AFE4C62B1A14}.Debug.ActiveCfg = Debug|Win32 - {8C48C30B-375A-42D6-B149-AFE4C62B1A14}.Debug.Build.0 = Debug|Win32 - {8C48C30B-375A-42D6-B149-AFE4C62B1A14}.Release.ActiveCfg = Release|Win32 - {8C48C30B-375A-42D6-B149-AFE4C62B1A14}.Release.Build.0 = Release|Win32 - {FB9BF183-F75B-462C-9A5F-988D5E2E1C11}.Debug.ActiveCfg = Debug|Win32 - {FB9BF183-F75B-462C-9A5F-988D5E2E1C11}.Debug.Build.0 = Debug|Win32 - {FB9BF183-F75B-462C-9A5F-988D5E2E1C11}.Release.ActiveCfg = Release|Win32 - {FB9BF183-F75B-462C-9A5F-988D5E2E1C11}.Release.Build.0 = Release|Win32 - {DA26770C-AFF6-450E-93EC-392723C173FC}.Debug.ActiveCfg = Debug|Win32 - {DA26770C-AFF6-450E-93EC-392723C173FC}.Debug.Build.0 = Debug|Win32 - {DA26770C-AFF6-450E-93EC-392723C173FC}.Release.ActiveCfg = Release|Win32 - {DA26770C-AFF6-450E-93EC-392723C173FC}.Release.Build.0 = Release|Win32 - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.Debug.ActiveCfg = Debug|Win32 - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.Debug.Build.0 = Debug|Win32 - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.Release.ActiveCfg = Release|Win32 - {99D7F83E-16F1-4C25-999A-C844E6D2A68B}.Release.Build.0 = Release|Win32 - {5E240333-1205-4404-98F3-8A4061046DA8}.Debug.ActiveCfg = Debug|Win32 - {5E240333-1205-4404-98F3-8A4061046DA8}.Debug.Build.0 = Debug|Win32 - {5E240333-1205-4404-98F3-8A4061046DA8}.Release.ActiveCfg = Release|Win32 - {5E240333-1205-4404-98F3-8A4061046DA8}.Release.Build.0 = Release|Win32 + {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 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/src/rrdtool.vcproj b/src/rrdtool.vcproj index b3f2635..4caaa32 100644 --- a/src/rrdtool.vcproj +++ b/src/rrdtool.vcproj @@ -1,7 +1,7 @@ - + @@ -20,10 +20,9 @@ CharacterSet="2"> + SubSystem="1" + TargetMachine="1"/> + TypeLibraryName=".\toolrelease/rrdtool.tlb" + HeaderFileName=""/> + + + + SubSystem="1" + TargetMachine="1"/> + TypeLibraryName=".\tooldebug/rrdtool.tlb" + HeaderFileName=""/> + + + + + + RelativePath="rrd_tool.c"> + + + + + + -- 2.11.0