diff --git a/win32/rrdtool.vcproj b/win32/rrdtool.vcproj
index e98dd8bd6d021ef4310465200c6637a2098908f9..e434a4a3e38b29269018e7946b5a369b3537bce5 100644 (file)
--- a/win32/rrdtool.vcproj
+++ b/win32/rrdtool.vcproj
<?xml version="1.0" encoding="Windows-1252"?>\r
<VisualStudioProject\r
ProjectType="Visual C++"\r
- Version="9,00"\r
+ Version="9.00"\r
Name="rrdtool"\r
ProjectGUID="{11CD05F8-E5E1-476E-A75F-A112655D4E94}"\r
RootNamespace="rrdtool"\r
<Configurations>\r
<Configuration\r
Name="Debug|Win32"\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ OutputDirectory="$(ConfigurationName)"\r
IntermediateDirectory="$(ConfigurationName)"\r
ConfigurationType="1"\r
CharacterSet="2"\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
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"\r
MinimalRebuild="true"\r
BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
+ RuntimeLibrary="1"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdtool.pdb"\r
WarningLevel="3"\r
DebugInformationFormat="4"\r
+ DisableSpecificWarnings="4996"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
- AdditionalDependencies="rrdlib.lib 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="$(ConfigurationName); ../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"\r
+ AdditionalDependencies="rrdlib.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)""\r
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"\r
GenerateDebugInformation="true"\r
+ SubSystem="0"\r
TargetMachine="1"\r
/>\r
<Tool\r
<Tool\r
Name="VCPostBuildEventTool"\r
Description="get all the dlls, needed for running"\r
- CommandLine="copy $(ProjectDir)\..\..\contrib\cairo\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libpng\bin\libpng12-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\zlib\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libxml2\lib\libxml2.dll $(TargetDir)\
"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
/>\r
</Configuration>\r
<Configuration\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
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="true"\r
+ ProgramDataBaseFileName="$(IntDir)\rrdtool.pdb"\r
WarningLevel="3"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="rrdlib.lib 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="$(ConfigurationName); ../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"\r
- GenerateDebugInformation="true"\r
+ AdditionalLibraryDirectories="$(ConfigurationName); ../contrib/lib"\r
+ GenerateDebugInformation="false"\r
OptimizeReferences="2"\r
EnableCOMDATFolding="2"\r
TargetMachine="1"\r
<Tool\r
Name="VCPostBuildEventTool"\r
Description="get all the dlls, needed for running"\r
- CommandLine="copy $(ProjectDir)\..\..\contrib\cairo\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\glib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libpng\bin\libpng12-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\pango\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\zlib\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\..\contrib\libxml2\lib\libxml2.dll $(TargetDir)\
"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libexpat-1.dll $(TargetDir)\
"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Static Debug|Win32"\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+ IntermediateDirectory="$(ConfigurationName)"\r
+ ConfigurationType="1"\r
+ CharacterSet="2"\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
+ InlineFunctionExpansion="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="1"\r
+ WarningLevel="3"\r
+ DebugInformationFormat="4"\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="rrdlib.lib cairo.lib"\r
+ ShowProgress="2"\r
+ AdditionalLibraryDirectories=""$(ConfigurationName)";../contrib/lib"\r
+ IgnoreDefaultLibraryNames=""\r
+ GenerateDebugInformation="true"\r
+ SubSystem="0"\r
+ TargetMachine="1"\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
+ Description="get all the dlls, needed for running"\r
+ CommandLine="copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libfontconfig-1.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libglib-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgmodule-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgobject-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libgthread-2.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpango-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangocairo-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\
copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\


"\r
/>\r
</Configuration>\r
</Configurations>\r
<References>\r
+ <ProjectReference\r
+ ReferencedProjectIdentifier="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"\r
+ />\r
</References>\r
<Files>\r
<Filter\r