From: Wolfgang Stöggl <c72578@yahoo.de>
Date: Tue, 25 Jun 2019 09:03:26 +0000 (+0200)
Subject: Add platform x64 to MSVC .sln and .vcxproj files
X-Git-Tag: v1.8.0~86
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bfe03f3cd575500522ff776140fff188e32b9bde;p=thirdparty%2Frrdtool-1.x.git

Add platform x64 to MSVC .sln and .vcxproj files

So far, MSVC x64 builds have been created using nmake. This adds x64 to
the .sln and .vcxproj files and x64 can be chosen within Visual Studio.

- Update the created x64 platform configurations with the matching
  include and lib directories
- Remove unnecessary and incorrect <AdditionalIncludeDirectories>
  from rrdtool.vcxproj and rrdupdate.vcxproj (one ../ was too much)
---

diff --git a/win32/librrd-8.vcxproj b/win32/librrd-8.vcxproj
index 4b81a53e..1cbc4693 100644
--- a/win32/librrd-8.vcxproj
+++ b/win32/librrd-8.vcxproj
@@ -5,22 +5,42 @@
       <Configuration>DebugDLL</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugDLL|x64">
+      <Configuration>DebugDLL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseDLL|Win32">
       <Configuration>ReleaseDLL</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseDLL|x64">
+      <Configuration>ReleaseDLL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Static Debug|Win32">
       <Configuration>Static Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Static Debug|x64">
+      <Configuration>Static Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}</ProjectGuid>
@@ -34,45 +54,87 @@
     <CharacterSet>MultiByte</CharacterSet>
     <CLRSupport>false</CLRSupport>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>false</CLRSupport>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
@@ -119,6 +181,29 @@
       <ModuleDefinitionFile />
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../contrib-x64/include/cairo;../contrib-x64/include/pango-1.0;../contrib-x64/include/glib-2.0;../contrib-x64/lib/glib-2.0/include;../contrib-x64/include;../contrib-x64/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -140,6 +225,28 @@
       <AdditionalLibraryDirectories>../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>.;../contrib-x64/include/cairo;../contrib-x64/include/pango-1.0;../contrib-x64/include/glib-2.0;../contrib-x64/lib/glib-2.0/include;../contrib-x64/include;../contrib-x64/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -163,6 +270,29 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../contrib-x64/include/cairo;../contrib-x64/include/pango-1.0;../contrib-x64/include/glib-2.0;../contrib-x64/lib/glib-2.0/include;../contrib-x64/include;../contrib-x64/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>librrd-8.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -185,6 +315,28 @@
       <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../contrib-x64/include/cairo;../contrib-x64/include/pango-1.0;../contrib-x64/include/glib-2.0;../contrib-x64/lib/glib-2.0/include;../contrib-x64/include;../contrib-x64/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
+    </ClCompile>
+    <Lib>
+      <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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -208,6 +360,29 @@
       <ModuleDefinitionFile>librrd-8.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../contrib-x64/include/cairo;../contrib-x64/include/pango-1.0;../contrib-x64/include/glib-2.0;../contrib-x64/lib/glib-2.0/include;../contrib-x64/include;../contrib-x64/include/libxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)librrd-8.pdb</ProgramDataBaseFileName>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;ws2_32.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>librrd-8.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\hash_32.c" />
     <ClCompile Include="..\src\mkstemp.c" />
diff --git a/win32/rrd.sln b/win32/rrd.sln
index 6b5665f4..024e1a4d 100644
--- a/win32/rrd.sln
+++ b/win32/rrd.sln
@@ -12,38 +12,73 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		DebugDLL|Win32 = DebugDLL|Win32
+		DebugDLL|x64 = DebugDLL|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 		ReleaseDLL|Win32 = ReleaseDLL|Win32
+		ReleaseDLL|x64 = ReleaseDLL|x64
 		Static Debug|Win32 = Static Debug|Win32
+		Static Debug|x64 = Static Debug|x64
 	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}.Debug|x64.ActiveCfg = Debug|x64
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Debug|x64.Build.0 = Debug|x64
 		{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}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.DebugDLL|x64.Build.0 = DebugDLL|x64
 		{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}.Release|x64.ActiveCfg = Release|x64
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Release|x64.Build.0 = Release|x64
 		{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}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
 		{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
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|x64.ActiveCfg = Static Debug|x64
+		{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}.Static Debug|x64.Build.0 = Static Debug|x64
 		{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}.Debug|x64.ActiveCfg = Debug|x64
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|x64.Build.0 = Debug|x64
 		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|Win32.ActiveCfg = Debug|Win32
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.DebugDLL|x64.Build.0 = Debug|x64
 		{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}.Release|x64.ActiveCfg = Release|x64
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|x64.Build.0 = Release|x64
 		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.ReleaseDLL|Win32.ActiveCfg = Release|Win32
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.ReleaseDLL|x64.Build.0 = Release|x64
 		{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
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|x64.ActiveCfg = Static Debug|x64
+		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Static Debug|x64.Build.0 = Static Debug|x64
 		{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}.Debug|x64.ActiveCfg = Debug|x64
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|x64.Build.0 = Debug|x64
 		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.DebugDLL|Win32.ActiveCfg = Debug|Win32
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.DebugDLL|x64.Build.0 = Debug|x64
 		{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}.Release|x64.ActiveCfg = Release|x64
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|x64.Build.0 = Release|x64
 		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.ReleaseDLL|Win32.ActiveCfg = Release|Win32
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.ReleaseDLL|x64.Build.0 = Release|x64
 		{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
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|x64.ActiveCfg = Static Debug|x64
+		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Static Debug|x64.Build.0 = Static Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/rrdtool.vcxproj b/win32/rrdtool.vcxproj
index 9a3b2ef7..246f5de9 100644
--- a/win32/rrdtool.vcxproj
+++ b/win32/rrdtool.vcxproj
@@ -5,14 +5,26 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Static Debug|Win32">
       <Configuration>Static Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Static Debug|x64">
+      <Configuration>Static Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{11CD05F8-E5E1-476E-A75F-A112655D4E94}</ProjectGuid>
@@ -24,29 +36,54 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
@@ -75,7 +112,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -103,6 +140,47 @@ 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)\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ProgramDataBaseFileName>$(IntDir)rrdtool.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -110,7 +188,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -144,6 +222,46 @@ 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)\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ProgramDataBaseFileName>$(IntDir)rrdtool.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration); ../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -158,7 +276,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -170,6 +288,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     </Link>
     <PostBuildEvent>
       <Message>get all the dlls, needed for running</Message>
+      <!-- "Static Debug" contains a space, add quotes around $(TargetDir) -->
       <Command>copy $(ProjectDir)\..\contrib\bin\freetype6.dll "$(TargetDir)"\
 copy $(ProjectDir)\..\contrib\bin\intl.dll "$(TargetDir)"\
 copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll "$(TargetDir)"\
@@ -186,6 +305,47 @@ 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)"\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration);../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <!-- "Static Debug" contains a space, add quotes around $(TargetDir) -->
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll "$(TargetDir)"\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/win32/rrdupdate.vcxproj b/win32/rrdupdate.vcxproj
index 3577659e..e82142b1 100644
--- a/win32/rrdupdate.vcxproj
+++ b/win32/rrdupdate.vcxproj
@@ -5,14 +5,26 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Static Debug|Win32">
       <Configuration>Static Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Static Debug|x64">
+      <Configuration>Static Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3AAE1E07-78D7-420D-968B-D2087D732D3B}</ProjectGuid>
@@ -24,29 +36,54 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
@@ -104,6 +141,48 @@ 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)\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ProgramDataBaseFileName>$(IntDir)rrdupdate.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -111,7 +190,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -145,6 +224,46 @@ 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)\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ProgramDataBaseFileName>$(IntDir)rrdupdate.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration); ../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -171,6 +290,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     </Link>
     <PostBuildEvent>
       <Message>get all the dlls, needed for running</Message>
+      <!-- "Static Debug" contains a space, add quotes around $(TargetDir) -->
       <Command>copy $(ProjectDir)\..\contrib\bin\freetype6.dll "$(TargetDir)"\
 copy $(ProjectDir)\..\contrib\bin\intl.dll "$(TargetDir)"\
 copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll "$(TargetDir)"\
@@ -187,6 +307,47 @@ 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)"\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Platform)/$(Configuration);../contrib-x64/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <!-- "Static Debug" contains a space, add quotes around $(TargetDir) -->
+      <Command>copy $(ProjectDir)\..\contrib-x64\bin\libcairo-2.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libexpat-1.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libffi-6.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libfontconfig-1.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libfreetype-6.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libglib-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libgmodule-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libgobject-2.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libintl-8.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpango-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangocairo-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangoft2-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpangowin32-1.0-0.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libpng14-14.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\libxml2-2.dll "$(TargetDir)"\
+copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll "$(TargetDir)"\
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>