From 28f88df37c5d98fe9f57558357ee851312d6f1aa Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 7 Jul 2012 13:17:50 +0200 Subject: [PATCH] Fixed build on Win32. --- cib/cib.vcxproj | 8 +- cib/cib.vcxproj.filters | 86 +++++++++++++++++ components/checker/checker.vcxproj | 4 +- components/cibsync/cibsync.vcxproj | 4 +- components/cibsync/cibsync.vcxproj.filters | 26 ++++++ components/compat/compat.vcxproj | 92 +++++++++++++++++++ components/compat/compat.vcxproj.filters | 26 ++++++ components/convenience/convenience.vcxproj | 92 +++++++++++++++++++ .../convenience/convenience.vcxproj.filters | 30 ++++++ components/delegation/delegation.vcxproj | 4 +- components/demo/demo.vcxproj | 4 +- components/discovery/discovery.vcxproj | 4 +- dyn/configitem.h | 2 +- dyn/configitembuilder.h | 2 +- dyn/dyn.vcxproj | 4 +- icinga-app/icinga-app.vcxproj | 4 +- icinga.sln | 10 ++ icinga/icinga.vcxproj | 8 +- 18 files changed, 386 insertions(+), 24 deletions(-) create mode 100644 cib/cib.vcxproj.filters create mode 100644 components/cibsync/cibsync.vcxproj.filters create mode 100644 components/compat/compat.vcxproj create mode 100644 components/compat/compat.vcxproj.filters create mode 100644 components/convenience/convenience.vcxproj create mode 100644 components/convenience/convenience.vcxproj.filters diff --git a/cib/cib.vcxproj b/cib/cib.vcxproj index afea90e61..d0bce3a36 100644 --- a/cib/cib.vcxproj +++ b/cib/cib.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) @@ -58,7 +58,7 @@ Windows true - base.lib;icinga.lib;jsonrpc.lib;%(AdditionalDependencies) + base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ true true true - base.lib;icinga.lib;jsonrpc.lib;%(AdditionalDependencies) + base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies) diff --git a/cib/cib.vcxproj.filters b/cib/cib.vcxproj.filters new file mode 100644 index 000000000..0f8679232 --- /dev/null +++ b/cib/cib.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + \ No newline at end of file diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index a2b22ebdf..e40c920ff 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -40,12 +40,12 @@ true $(OutDir);$(LibraryPath) - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) false $(OutDir);$(LibraryPath) - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) diff --git a/components/cibsync/cibsync.vcxproj b/components/cibsync/cibsync.vcxproj index 4a2063e3e..8c9299230 100644 --- a/components/cibsync/cibsync.vcxproj +++ b/components/cibsync/cibsync.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/components/cibsync/cibsync.vcxproj.filters b/components/cibsync/cibsync.vcxproj.filters new file mode 100644 index 000000000..d7a2dc912 --- /dev/null +++ b/components/cibsync/cibsync.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Headerdateien + + + Headerdateien + + + + + Quelldateien + + + \ No newline at end of file diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj new file mode 100644 index 000000000..a8b46b944 --- /dev/null +++ b/components/compat/compat.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} + Win32Proj + compat + + + + DynamicLibrary + true + NotSet + + + DynamicLibrary + false + true + NotSet + + + + + + + + + + + + + true + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(OutDir);$(LibraryPath) + + + false + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(OutDir);$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/compat/compat.vcxproj.filters b/components/compat/compat.vcxproj.filters new file mode 100644 index 000000000..18efa61bf --- /dev/null +++ b/components/compat/compat.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Headerdateien + + + Headerdateien + + + + + Quelldateien + + + \ No newline at end of file diff --git a/components/convenience/convenience.vcxproj b/components/convenience/convenience.vcxproj new file mode 100644 index 000000000..cf3269756 --- /dev/null +++ b/components/convenience/convenience.vcxproj @@ -0,0 +1,92 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D02A349B-BAF7-41FB-86FF-B05BA05FE578} + Win32Proj + convenience + + + + DynamicLibrary + true + MultiByte + + + DynamicLibrary + false + true + MultiByte + + + + + + + + + + + + + true + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(OutDir);$(LibraryPath) + + + false + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(OutDir);$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CONVENIENCE_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + base.lib;jsonrpc.lib;icinga.lib;cib.lib;dyn.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CONVENIENCE_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + base.lib;jsonrpc.lib;icinga.lib;cib.lib;dyn.lib;%(AdditionalDependencies) + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/convenience/convenience.vcxproj.filters b/components/convenience/convenience.vcxproj.filters new file mode 100644 index 000000000..9a47a8313 --- /dev/null +++ b/components/convenience/convenience.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj index e0d9a9cbb..6f5b7a277 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index 653970c34..8fb54b5b1 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/components/discovery/discovery.vcxproj b/components/discovery/discovery.vcxproj index e2bf71091..932c83f99 100644 --- a/components/discovery/discovery.vcxproj +++ b/components/discovery/discovery.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/dyn/configitem.h b/dyn/configitem.h index 429367885..5791a99b6 100644 --- a/dyn/configitem.h +++ b/dyn/configitem.h @@ -23,7 +23,7 @@ namespace icinga { -class ConfigItem : public Object { +class I2_DYN_API ConfigItem : public Object { public: typedef shared_ptr Ptr; typedef weak_ptr WeakPtr; diff --git a/dyn/configitembuilder.h b/dyn/configitembuilder.h index 1a2b09e75..a2812ee69 100644 --- a/dyn/configitembuilder.h +++ b/dyn/configitembuilder.h @@ -4,7 +4,7 @@ namespace icinga { -class ConfigItemBuilder : public Object +class I2_DYN_API ConfigItemBuilder : public Object { public: typedef shared_ptr Ptr; diff --git a/dyn/dyn.vcxproj b/dyn/dyn.vcxproj index f9ae0a29b..034c07f5f 100644 --- a/dyn/dyn.vcxproj +++ b/dyn/dyn.vcxproj @@ -13,7 +13,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index 86bc63b18..ebde93fee 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -43,12 +43,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/icinga.sln b/icinga.sln index 5d25c5e3e..5b95da923 100644 --- a/icinga.sln +++ b/icinga.sln @@ -15,6 +15,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "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 @@ -81,6 +82,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cibsync", "components\cibsy EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compat", "components\compat\compat.vcxproj", "{2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convenience", "components\convenience\convenience.vcxproj", "{D02A349B-BAF7-41FB-86FF-B05BA05FE578}" + ProjectSection(ProjectDependencies) = postProject + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -147,6 +153,10 @@ Global {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.Build.0 = Debug|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.ActiveCfg = Release|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.Build.0 = Release|Win32 + {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Debug|Win32.ActiveCfg = Debug|Win32 + {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Debug|Win32.Build.0 = Debug|Win32 + {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Release|Win32.ActiveCfg = Release|Win32 + {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj index c15bac63b..808bf3170 100644 --- a/icinga/icinga.vcxproj +++ b/icinga/icinga.vcxproj @@ -55,12 +55,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) $(OutDir);$(LibraryPath) @@ -76,7 +76,7 @@ Console true - base.lib;jsonrpc.lib;cJSON.lib;%(AdditionalDependencies) + base.lib;jsonrpc.lib;cJSON.lib;dyn.lib;%(AdditionalDependencies) @@ -97,7 +97,7 @@ true true true - base.lib;jsonrpc.lib;cJSON.lib;%(AdditionalDependencies) + base.lib;jsonrpc.lib;cJSON.lib;dyn.lib;%(AdditionalDependencies)