From: Wolfgang Stöggl Date: Thu, 27 Jun 2019 14:06:52 +0000 (+0200) Subject: Update MSVC rrd.sln and .vcxproj files X-Git-Tag: v1.8.0~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a19688262a565ed47424d1d29c0585b37df142aa;p=thirdparty%2Frrdtool-1.x.git 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 before 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 024e1a4d..1cdc7a40 100644 --- 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 246f5de9..260bec40 100644 --- a/win32/rrdtool.vcxproj +++ b/win32/rrdtool.vcxproj @@ -104,6 +104,7 @@ Disabled Default + .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -112,7 +113,6 @@ Level3 EditAndContinue 4996;%(DisableSpecificWarnings) - .;%(AdditionalIncludeDirectories) librrd-8.lib;%(AdditionalDependencies) @@ -147,6 +147,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ Disabled Default + .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -154,7 +155,6 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ Level3 ProgramDatabase 4996;%(DisableSpecificWarnings) - .;%(AdditionalIncludeDirectories) librrd-8.lib;%(AdditionalDependencies) @@ -269,6 +269,7 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\ Disabled Default + .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -276,7 +277,6 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\ Level3 EditAndContinue 4996;%(DisableSpecificWarnings) - .;%(AdditionalIncludeDirectories) librrd-8.lib;cairo.lib;%(AdditionalDependencies) @@ -312,13 +312,13 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll "$(TargetDir)"\ Disabled Default + .;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Level3 ProgramDatabase 4996;%(DisableSpecificWarnings) - .;%(AdditionalIncludeDirectories) librrd-8.lib;cairo.lib;%(AdditionalDependencies) diff --git a/win32/rrdupdate.vcxproj b/win32/rrdupdate.vcxproj index e82142b1..39fcde3f 100644 --- a/win32/rrdupdate.vcxproj +++ b/win32/rrdupdate.vcxproj @@ -201,7 +201,7 @@ copy $(ProjectDir)\..\contrib-x64\bin\zlib1.dll $(TargetDir)\ 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) $(Configuration); ../contrib/lib;%(AdditionalLibraryDirectories) - true + false true true MachineX86 @@ -242,7 +242,7 @@ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ 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) $(Platform)/$(Configuration); ../contrib-x64/lib;%(AdditionalLibraryDirectories) - true + false true true