From: Wolfgang Stöggl <c72578@yahoo.de>
Date: Thu, 27 Jun 2019 19:35:40 +0000 (+0200)
Subject: Add rrdcgi.vcxproj and update Makefile.am (MSVC)
X-Git-Tag: v1.8.0~83
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8f0d15dc753cb94119553c98393d9ffebd5e88bc;p=thirdparty%2Frrdtool-1.x.git

Add rrdcgi.vcxproj and update Makefile.am (MSVC)

So far, rrdcgi.exe has been built using nmake. Add rrdcgi.vcxproj
as an additional Visual Studio project and add it to rrd.sln

- Update Makefile.am:
  Add win32/rrdcgi.vcxproj and win32/Makefile_vcpkg.msc to EXTRA_DIST
  Remove win32/rrdtool.sln and win32/rrdupdate.sln, because all
  projects are part of rrd.sln
- git rm win32/rrdtool.sln win32/rrdupdate.sln
---

diff --git a/Makefile.am b/Makefile.am
index 1da51d63..a7d270c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,10 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
              m4/snprintf.m4 \
              win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \
              win32/librrd-8.def win32/librrd-8.rc win32/librrd-8.vcxproj \
-             win32/Makefile.msc win32/README win32/README-MinGW-w64 win32/rrdcgi.rc win32/rrd_config.h \
-             win32/rrd.sln win32/rrdtool.rc win32/rrdtool.sln win32/rrdtool.vcxproj win32/rrdupdate.rc \
-             win32/rrdupdate.sln win32/rrdupdate.vcxproj win32/uac.manifest \
+             win32/Makefile.msc win32/Makefile_vcpkg.msc win32/README win32/README-MinGW-w64 \
+             win32/rrdcgi.rc win32/rrd_config.h \
+             win32/rrd.sln win32/rrdtool.rc win32/rrdtool.vcxproj win32/rrdupdate.rc \
+             win32/rrdcgi.vcxproj win32/rrdupdate.vcxproj win32/uac.manifest \
              win32/asprintf.c win32/asprintf.h win32/dirent.h win32/vasprintf-msvc.c
 
 CLEANFILES = config.cache
diff --git a/win32/rrd.sln b/win32/rrd.sln
index 1cdc7a40..ee46a87b 100644
--- a/win32/rrd.sln
+++ b/win32/rrd.sln
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcxproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdcgi", "rrdcgi.vcxproj", "{87299711-CA4F-418B-A166-61D1EA021CAE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -75,6 +77,22 @@ Global
 		{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
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Debug|Win32.Build.0 = Debug|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Debug|x64.ActiveCfg = Debug|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Debug|x64.Build.0 = Debug|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.DebugDLL|Win32.ActiveCfg = Debug|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Release|Win32.ActiveCfg = Release|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Release|Win32.Build.0 = Release|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Release|x64.ActiveCfg = Release|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Release|x64.Build.0 = Release|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.ReleaseDLL|Win32.ActiveCfg = Release|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Static Debug|Win32.Build.0 = Static Debug|Win32
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Static Debug|x64.ActiveCfg = Static Debug|x64
+		{87299711-CA4F-418B-A166-61D1EA021CAE}.Static Debug|x64.Build.0 = Static Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/rrdcgi.vcxproj b/win32/rrdcgi.vcxproj
new file mode 100644
index 00000000..fc6b5318
--- /dev/null
+++ b/win32/rrdcgi.vcxproj
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <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>{87299711-CA4F-418B-A166-61D1EA021CAE}</ProjectGuid>
+    <RootNamespace>rrdtool</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ProgramDataBaseFileName>$(IntDir)rrdcgi.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\intl.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\libexpat-1.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)\
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ProgramDataBaseFileName>$(IntDir)rrdcgi.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>
+      <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>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <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>
+      <ProgramDataBaseFileName>$(IntDir)rrdcgi.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>$(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Message>get all the dlls, needed for running</Message>
+      <Command>copy $(ProjectDir)\..\contrib\bin\freetype6.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\intl.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\libcairo-2.dll $(TargetDir)\
+copy $(ProjectDir)\..\contrib\bin\libexpat-1.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)\
+</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)rrdcgi.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>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>LinkVerboseLib</ShowProgress>
+      <AdditionalLibraryDirectories>$(Configuration);../contrib/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>NotSet</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </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)"\
+copy $(ProjectDir)\..\contrib\bin\libexpat-1.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)"\
+</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>
+  <ItemGroup>
+    <ClCompile Include="..\src\rrd_cgi.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="rrd_config.h" />
+    <ClInclude Include="..\src\rrd_tool.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="librrd-8.vcxproj">
+      <Project>{cc158e1d-1364-43ca-9b2d-4af54225c7ca}</Project>
+    </ProjectReference>
+    <!-- Reference rrdtool and rrdupdate, to avoid potential parallel build issues -->
+    <ProjectReference Include="rrdtool.vcxproj">
+      <Project>{11cd05f8-e5e1-476e-a75f-a112655d4e94}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="rrdupdate.vcxproj">
+      <Project>{3AAE1E07-78D7-420D-968B-D2087D732D3B}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/rrdtool.sln b/win32/rrdtool.sln
deleted file mode 100644
index 855e1654..00000000
--- a/win32/rrdtool.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcxproj", "{11CD05F8-E5E1-476E-A75F-A112655D4E94}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Debug|Win32.Build.0 = Debug|Win32
-		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.ActiveCfg = Release|Win32
-		{11CD05F8-E5E1-476E-A75F-A112655D4E94}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/rrdupdate.sln b/win32/rrdupdate.sln
deleted file mode 100644
index 9e8921a3..00000000
--- a/win32/rrdupdate.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdupdate", "rrdupdate.vcxproj", "{3AAE1E07-78D7-420D-968B-D2087D732D3B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Debug|Win32.Build.0 = Debug|Win32
-		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.ActiveCfg = Release|Win32
-		{3AAE1E07-78D7-420D-968B-D2087D732D3B}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal