From f8c057d63af57c1aaff7f47cab6c38b4dcd6aeb6 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 15 Oct 2013 20:28:47 +0200 Subject: [PATCH] Windows build fix. --- components/perfdata/perfdata.vcxproj | 34 +++++++++++--------- components/perfdata/perfdata.vcxproj.filters | 9 +++++- components/perfdata/perfdatawriter.h | 2 +- icinga2.sln | 17 ++++++++++ lib/icinga/icinga.vcxproj | 2 -- lib/icinga/icinga.vcxproj.filters | 6 ---- 6 files changed, 44 insertions(+), 26 deletions(-) diff --git a/components/perfdata/perfdata.vcxproj b/components/perfdata/perfdata.vcxproj index 5f5cf24ac..7195791d0 100644 --- a/components/perfdata/perfdata.vcxproj +++ b/components/perfdata/perfdata.vcxproj @@ -27,9 +27,11 @@ NotUsing NotUsing + + @@ -56,10 +58,10 @@ - {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} + {E08A9B69-97E2-4203-B4D7-501DFF020CCF} Win32Proj - icinga - icinga + perfdata + perfdata @@ -106,28 +108,28 @@ true - $(SolutionDir)\lib;$(IncludePath) + $(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)\lib;$(IncludePath) + $(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)\lib;$(IncludePath) + $(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)\lib;$(IncludePath) + $(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -136,7 +138,7 @@ NotUsing Disabled - _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;I2_ICINGA_BUILD;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 false i2-icinga.h @@ -145,14 +147,14 @@ Console true - base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) NotUsing Disabled - _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;I2_ICINGA_BUILD;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;%(PreprocessorDefinitions) Level3 false i2-icinga.h @@ -161,7 +163,7 @@ Console true - base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) @@ -170,7 +172,7 @@ MaxSpeed true true - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;I2_ICINGA_BUILD;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Speed Level3 false @@ -182,7 +184,7 @@ true true true - base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) @@ -191,7 +193,7 @@ MaxSpeed true true - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;I2_ICINGA_BUILD;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Speed Level3 false @@ -203,7 +205,7 @@ true true true - base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) @@ -221,4 +223,4 @@ - + \ No newline at end of file diff --git a/components/perfdata/perfdata.vcxproj.filters b/components/perfdata/perfdata.vcxproj.filters index 5fc326f58..a3e56fad3 100644 --- a/components/perfdata/perfdata.vcxproj.filters +++ b/components/perfdata/perfdata.vcxproj.filters @@ -4,11 +4,18 @@ Quelldateien + + + Quelldateien + Headerdateien + + Headerdateien + @@ -26,4 +33,4 @@ - + \ No newline at end of file diff --git a/components/perfdata/perfdatawriter.h b/components/perfdata/perfdatawriter.h index a73a5f4c6..9518924f4 100644 --- a/components/perfdata/perfdatawriter.h +++ b/components/perfdata/perfdatawriter.h @@ -34,7 +34,7 @@ namespace icinga * * @ingroup icinga */ -class I2_ICINGA_API PerfdataWriter : public DynamicObject +class PerfdataWriter : public DynamicObject { public: DECLARE_PTR_TYPEDEFS(PerfdataWriter); diff --git a/icinga2.sln b/icinga2.sln index 5dcb15a0e..66a3aa898 100644 --- a/icinga2.sln +++ b/icinga2.sln @@ -112,6 +112,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_ido", "lib\db_ido\db_ido {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perfdata", "components\perfdata\perfdata.vcxproj", "{E08A9B69-97E2-4203-B4D7-501DFF020CCF}" + ProjectSection(ProjectDependencies) = postProject + {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311} + {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -249,6 +257,14 @@ Global {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|Win32.Build.0 = Release|Win32 {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|x64.ActiveCfg = Release|x64 {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Release|x64.Build.0 = Release|x64 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Debug|Win32.ActiveCfg = Debug|Win32 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Debug|Win32.Build.0 = Debug|Win32 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Debug|x64.ActiveCfg = Debug|x64 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Debug|x64.Build.0 = Debug|x64 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Release|Win32.ActiveCfg = Release|Win32 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Release|Win32.Build.0 = Release|Win32 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Release|x64.ActiveCfg = Release|x64 + {E08A9B69-97E2-4203-B4D7-501DFF020CCF}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -261,6 +277,7 @@ Global {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F} = {4A1773FD-DDED-4952-8700-C898E890554A} {8732E0CD-E3D0-41F2-A538-94884543890F} = {4A1773FD-DDED-4952-8700-C898E890554A} {273A9D62-F556-4B5E-B235-B608106CB028} = {4A1773FD-DDED-4952-8700-C898E890554A} + {E08A9B69-97E2-4203-B4D7-501DFF020CCF} = {4A1773FD-DDED-4952-8700-C898E890554A} {19CBCE06-3F5C-479A-BD75-E2AB6215D345} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7} {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7} {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 67f047409..7a0705ecd 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -43,7 +43,6 @@ - @@ -79,7 +78,6 @@ - diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters index dbba51c21..daa423c9e 100644 --- a/lib/icinga/icinga.vcxproj.filters +++ b/lib/icinga/icinga.vcxproj.filters @@ -91,9 +91,6 @@ Quelldateien - - Quelldateien - Quelldateien @@ -183,9 +180,6 @@ Headerdateien - - Headerdateien - Headerdateien