diff --git a/win32/rrdlib.vcproj b/win32/rrdlib.vcproj
index 00a8b01265dc539c7431b404f3d39c3aa3c7caa6..bf53b39c30800a8b3a803e460b60def9f8ff79ad 100644 (file)
--- a/win32/rrdlib.vcproj
+++ b/win32/rrdlib.vcproj
<?xml version="1.0" encoding="windows-1251"?>\r
<VisualStudioProject\r
ProjectType="Visual C++"\r
<?xml version="1.0" encoding="windows-1251"?>\r
<VisualStudioProject\r
ProjectType="Visual C++"\r
- Version="9,00"\r
+ Version="9.00"\r
Name="rrdlib"\r
ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
RootNamespace="rrdlib"\r
Name="rrdlib"\r
ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
RootNamespace="rrdlib"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ OutputDirectory="$(ConfigurationName)"\r
IntermediateDirectory="$(ConfigurationName)"\r
ConfigurationType="4"\r
CharacterSet="1"\r
IntermediateDirectory="$(ConfigurationName)"\r
ConfigurationType="4"\r
CharacterSet="1"\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
MinimalRebuild="true"\r
BasicRuntimeChecks="3"\r
RuntimeLibrary="3"\r
UsePrecompiledHeader="0"\r
MinimalRebuild="true"\r
BasicRuntimeChecks="3"\r
RuntimeLibrary="3"\r
UsePrecompiledHeader="0"\r
- PrecompiledHeaderThrough="precompiled.h"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
CompileAs="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
CompileAs="2"\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
- AdditionalLibraryDirectories="../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
EnableIntrinsicFunctions="true"\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
EnableIntrinsicFunctions="true"\r
- AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="true"\r
UsePrecompiledHeader="0"\r
PrecompiledHeaderThrough="precompiled.h"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="true"\r
UsePrecompiledHeader="0"\r
PrecompiledHeaderThrough="precompiled.h"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
CompileAs="2"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
CompileAs="2"\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
<Tool\r
Name="VCLibrarianTool"\r
AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
- AdditionalLibraryDirectories="../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="DebugDLL|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="2"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCFxCopTool"\r
/>\r
<Tool\r
Name="VCFxCopTool"\r
/>\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Static Debug|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="4"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLibrarianTool"\r
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="ReleaseDLL|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="2"\r
+ CharacterSet="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"\r
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;strftime=strftime_"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="0"\r
+ UsePrecompiledHeader="0"\r
+ PrecompiledHeaderThrough=""\r
+ ProgramDataBaseFileName="$(IntDir)\rrdlib.pdb"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="3"\r
+ CompileAs="2"\r
+ DisableSpecificWarnings="4996"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"\r
+ AdditionalLibraryDirectories="../contrib/lib"\r
+ ModuleDefinitionFile=""\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
<Tool\r
Name="VCPostBuildEventTool"\r
/>\r
<Tool\r
Name="VCPostBuildEventTool"\r
/>\r
RelativePath="..\src\hash_32.c"\r
>\r
</File>\r
RelativePath="..\src\hash_32.c"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\src\plbasename.c"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\src\pngsize.c"\r
>\r
<File\r
RelativePath="..\src\pngsize.c"\r
>\r
RelativePath="..\src\rrd_update.c"\r
>\r
</File>\r
RelativePath="..\src\rrd_update.c"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\src\rrd_utils.c"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\src\rrd_version.c"\r
>\r
<File\r
RelativePath="..\src\rrd_version.c"\r
>\r
RelativePath="..\src\rrd_xport.c"\r
>\r
</File>\r
RelativePath="..\src\rrd_xport.c"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\src\strftime.c"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Header Files"\r
</Filter>\r
<Filter\r
Name="Header Files"\r
RelativePath="..\src\fnv.h"\r
>\r
</File>\r
RelativePath="..\src\fnv.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\src\plbasename.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\src\rrd.h"\r
>\r
<File\r
RelativePath="..\src\rrd.h"\r
>\r
RelativePath="..\src\rrd_xport.h"\r
>\r
</File>\r
RelativePath="..\src\rrd_xport.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\src\strftime.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\src\unused.h"\r
>\r
<File\r
RelativePath="..\src\unused.h"\r
>\r
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
>\r
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
>\r
+ <File\r
+ RelativePath=".\rrdlib.def"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
</Filter>\r
</Files>\r
<Globals>\r