Update MSVC rrd.sln and .vcxproj files

- rrd.sln:
  Do not build rrdtool and rrdupdate in case of configurations
  DebugDLL|x64 and ReleaseDLL|x64
- rrdtool.vcxproj:
  Move <AdditionalIncludeDirectories> before <PreprocessorDefinitions>
  like in librrd-8.vcxproj, rrdupdate.vcxproj and the other occurrences
  in rrdtool.vcxproj
- rrdupdate.vcxproj:
  Change GenerateDebugInformation for Release configurations from
  true to false

diff --git a/win32/rrd.sln b/win32/rrd.sln
index 024e1a4d626b84dbc88780a93e00093c39cf0b8d..1cdc7a406ecb84e886be4564d1af90a7162304b5 100644 (file)
--- a/win32/rrd.sln
+++ b/win32/rrd.sln
@@ -49,14 +49,12 @@ Global
                {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
@@ -67,14 +65,12 @@ Global
                {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

diff --git a/win32/rrdtool.vcxproj b/win32/rrdtool.vcxproj
index 246f5de9cb53e414fc69c3f71f9efe7f4868f022..260bec4089d0ff5e9930643571e121f606f8480d 100644 (file)
--- a/win32/rrdtool.vcxproj
+++ b/win32/rrdtool.vcxproj
@@ -104,6 +104,7 @@
     <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>
@@ -112,7 +113,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -147,6 +147,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     <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>
@@ -154,7 +155,6 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -269,6 +269,7 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -276,7 +277,6 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -312,13 +312,13 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\
     <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>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>librrd-8.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/win32/rrdupdate.vcxproj b/win32/rrdupdate.vcxproj
index e82142b1cf6f9555037bb78509996893e8023880..39fcde3f461d6f634c94d22ec112a540b4fcb863 100644 (file)
--- a/win32/rrdupdate.vcxproj
+++ b/win32/rrdupdate.vcxproj
@@ -201,7 +201,7 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\
     <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>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
@@ -242,7 +242,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\
     <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>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>