From 8e4bdf3872658e071da76300fb4056f490c73af9 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 10 Sep 2012 14:35:01 +0200 Subject: [PATCH] Build fixes for Windows. --- components/checker/checker.vcxproj | 8 +-- components/cibsync/cibsync.vcxproj | 8 +-- components/compat/compat.vcxproj | 8 +-- components/convenience/convenience.vcxproj | 8 +-- components/delegation/delegation.vcxproj | 8 +-- components/demo/demo.vcxproj | 8 +-- icinga-app/icinga-app.vcxproj | 8 +-- icinga.sln | 30 +++++----- lib/icinga/icinga.vcxproj | 30 +++++++--- lib/icinga/icinga.vcxproj.filters | 58 ++++++++++++++++--- lib/remoting/i2-remoting.cpp | 2 +- .../{jsonrpc.vcxproj => remoting.vcxproj} | 26 +++++---- ...xproj.filters => remoting.vcxproj.filters} | 20 +++++-- 13 files changed, 145 insertions(+), 77 deletions(-) rename lib/remoting/{jsonrpc.vcxproj => remoting.vcxproj} (82%) rename lib/remoting/{jsonrpc.vcxproj.filters => remoting.vcxproj.filters} (76%) diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index fa8910a87..fdc549e9e 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -40,12 +40,12 @@ true $(OutDir);$(LibraryPath) - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) false $(OutDir);$(LibraryPath) - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) @@ -58,7 +58,7 @@ Windows true - base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ true true true - base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/components/cibsync/cibsync.vcxproj b/components/cibsync/cibsync.vcxproj index 71bf6a6ab..763ad2cbd 100644 --- a/components/cibsync/cibsync.vcxproj +++ b/components/cibsync/cibsync.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -57,7 +57,7 @@ Windows true - base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -74,7 +74,7 @@ true true true - base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj index 90c53b03e..ecdafb34f 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -57,7 +57,7 @@ Windows true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -74,7 +74,7 @@ true true true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/components/convenience/convenience.vcxproj b/components/convenience/convenience.vcxproj index 96c5d6e55..39cd65bc6 100644 --- a/components/convenience/convenience.vcxproj +++ b/components/convenience/convenience.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -57,7 +57,7 @@ Windows true - base.lib;jsonrpc.lib;icinga.lib;cib.lib;dyn.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -74,7 +74,7 @@ true true true - base.lib;jsonrpc.lib;icinga.lib;cib.lib;dyn.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj index 2083cb072..3d0ee725a 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\cib;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -58,7 +58,7 @@ Windows true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ true true true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index b8876543e..3bc557941 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -58,7 +58,7 @@ Windows true - base.lib;jsonrpc.lib;icinga.lib;cJSON.lib;%(AdditionalDependencies) + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ true true true - base.lib;jsonrpc.lib;icinga.lib;cJSON.lib;%(AdditionalDependencies) + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index 8abd55889..70b28dcc4 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -43,12 +43,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -62,7 +62,7 @@ Console true - base.lib;dyn.lib;icinga.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) @@ -81,7 +81,7 @@ true true true - base.lib;dyn.lib;icinga.lib;%(AdditionalDependencies) + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) diff --git a/icinga.sln b/icinga.sln index c62fd904a..95c6df517 100644 --- a/icinga.sln +++ b/icinga.sln @@ -23,31 +23,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmatch", "third-party\mmatc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checker", "components\checker\checker.vcxproj", "{38CE81CC-2660-4EF0-A936-4A337591DA3E}" ProjectSection(ProjectDependencies) = postProject - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "delegation", "components\delegation\delegation.vcxproj", "{17C93245-8C20-4316-9573-1AE41D918C10}" ProjectSection(ProjectDependencies) = postProject - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cibsync", "components\cibsync\cibsync.vcxproj", "{704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}" ProjectSection(ProjectDependencies) = postProject - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compat", "components\compat\compat.vcxproj", "{2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}" ProjectSection(ProjectDependencies) = postProject - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convenience", "components\convenience\convenience.vcxproj", "{D02A349B-BAF7-41FB-86FF-B05BA05FE578}" ProjectSection(ProjectDependencies) = postProject - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject @@ -63,18 +58,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "lib\base\base.vcxpr {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {66BED474-C33F-48F9-90BA-BBCFEDC006B8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cib", "lib\cib\cib.vcxproj", "{538D7F53-A6A0-459A-AE4F-70DB135BC9AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "lib\config\config.vcxproj", "{B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}" ProjectSection(ProjectDependencies) = postProject {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} - {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "lib\config\config.vcxproj", "{B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "lib\icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}" ProjectSection(ProjectDependencies) = postProject {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "lib\icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remoting", "lib\remoting\remoting.vcxproj", "{8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}" ProjectSection(ProjectDependencies) = postProject {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} @@ -126,10 +122,6 @@ Global {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32 - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF}.Debug|Win32.Build.0 = Debug|Win32 - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF}.Release|Win32.ActiveCfg = Release|Win32 - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF}.Release|Win32.Build.0 = Release|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.ActiveCfg = Debug|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.Build.0 = Debug|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.ActiveCfg = Release|Win32 @@ -138,15 +130,15 @@ Global {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.Build.0 = Debug|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.ActiveCfg = Release|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.Build.0 = Debug|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} - {538D7F53-A6A0-459A-AE4F-70DB135BC9AF} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} - {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} - {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} {38CE81CC-2660-4EF0-A936-4A337591DA3E} = {4A1773FD-DDED-4952-8700-C898E890554A} {17C93245-8C20-4316-9573-1AE41D918C10} = {4A1773FD-DDED-4952-8700-C898E890554A} {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {4A1773FD-DDED-4952-8700-C898E890554A} @@ -155,5 +147,9 @@ Global {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {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} + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416} EndGlobalSection EndGlobal diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 0c55bc64d..4843e3180 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -11,19 +11,33 @@ - - + + + Create Create + + + + + + - - + + + + + + + + + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} @@ -55,12 +69,12 @@ true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\jsonrpc;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -76,7 +90,7 @@ Console true - base.lib;jsonrpc.lib;cJSON.lib;dyn.lib;%(AdditionalDependencies) + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) @@ -97,7 +111,7 @@ true true true - base.lib;jsonrpc.lib;cJSON.lib;dyn.lib;%(AdditionalDependencies) + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters index 0ca5b46ee..f004eb51a 100644 --- a/lib/icinga/icinga.vcxproj.filters +++ b/lib/icinga/icinga.vcxproj.filters @@ -1,30 +1,72 @@  - + Quelldateien - + Quelldateien - + Quelldateien - + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + Quelldateien - + Headerdateien - + Headerdateien - + Headerdateien - + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + Headerdateien diff --git a/lib/remoting/i2-remoting.cpp b/lib/remoting/i2-remoting.cpp index 5a10b33f3..38af43183 100644 --- a/lib/remoting/i2-remoting.cpp +++ b/lib/remoting/i2-remoting.cpp @@ -19,4 +19,4 @@ /* This file is used by MSVC to generate the pre-compiled hedader. */ -#include "i2-jsonrpc.h" +#include "i2-remoting.h" diff --git a/lib/remoting/jsonrpc.vcxproj b/lib/remoting/remoting.vcxproj similarity index 82% rename from lib/remoting/jsonrpc.vcxproj rename to lib/remoting/remoting.vcxproj index e59e37dbd..be3cc84fb 100644 --- a/lib/remoting/jsonrpc.vcxproj +++ b/lib/remoting/remoting.vcxproj @@ -11,7 +11,9 @@ - + + + @@ -19,9 +21,11 @@ - - Create + + + Create + Create @@ -57,27 +61,27 @@ - $(SolutionDir)\base;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) - $(SolutionDir)\base;$(IncludePath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) Use Disabled - WIN32;I2_JSONRPC_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;I2_REMOTING_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions) Level3 false - i2-jsonrpc.h + i2-remoting.h true Windows true - base.lib;%(AdditionalDependencies) + base.lib;config.lib;%(AdditionalDependencies) @@ -90,11 +94,11 @@ MaxSpeed true true - WIN32;I2_JSONRPC_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;I2_REMOTING_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed Level3 false - i2-jsonrpc.h + i2-remoting.h true @@ -102,7 +106,7 @@ true true true - base.lib;%(AdditionalDependencies) + base.lib;config.lib;%(AdditionalDependencies) diff --git a/lib/remoting/jsonrpc.vcxproj.filters b/lib/remoting/remoting.vcxproj.filters similarity index 76% rename from lib/remoting/jsonrpc.vcxproj.filters rename to lib/remoting/remoting.vcxproj.filters index 8012b7ba5..1e5766784 100644 --- a/lib/remoting/jsonrpc.vcxproj.filters +++ b/lib/remoting/remoting.vcxproj.filters @@ -16,14 +16,17 @@ Quelldateien - + + Quelldateien + + + Quelldateien + + Quelldateien - - Headerdateien - Headerdateien @@ -39,6 +42,15 @@ Headerdateien + + Headerdateien + + + Headerdateien + + + Headerdateien + -- 2.40.0