diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index fdc549e9e..c73adb16d 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(OutDir);$(LibraryPath) $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(OutDir);$(LibraryPath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(OutDir);$(LibraryPath) $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(OutDir);$(LibraryPath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +136,24 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj index ecdafb34f..dc87a6d13 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} @@ -21,31 +29,66 @@ true NotSet + + DynamicLibrary + true + NotSet + DynamicLibrary false true NotSet + + DynamicLibrary + false + true + NotSet + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -60,6 +103,19 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -77,6 +133,23 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj index 3d0ee725a..f72d6eca3 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {17C93245-8C20-4316-9573-1AE41D918C10} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +136,24 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index 3bc557941..8024e5abc 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + MaxSpeed @@ -79,6 +136,24 @@ base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + true + true + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/replication/replication.vcxproj b/components/replication/replication.vcxproj index 7f021b74d..f70d618cc 100644 --- a/components/replication/replication.vcxproj +++ b/components/replication/replication.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -60,6 +103,19 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CIBSYNC_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -77,6 +133,23 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CIBSYNC_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + @@ -87,4 +160,4 @@ - + \ No newline at end of file diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index 70b28dcc4..f2ff366ca 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -25,31 +33,66 @@ true MultiByte + + Application + true + MultiByte + Application false true MultiByte + + Application + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ @@ -65,6 +108,20 @@ base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + + Disabled + WIN32;I2_ICINGALAUNCHER_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + false + true + + + Console + true + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + MaxSpeed @@ -84,6 +141,25 @@ base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Speed + Level3 + false + true + + + Console + true + true + true + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/icinga2.sln b/icinga2.sln index 8c39f2253..bc7905747 100644 --- a/icinga2.sln +++ b/icinga2.sln @@ -73,57 +73,107 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|Win64 = Debug|Win64 Release|Win32 = Release|Win32 + Release|Win64 = Release|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.ActiveCfg = Debug|Win32 {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.Build.0 = Debug|Win32 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.ActiveCfg = Debug|x64 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.Build.0 = Debug|x64 {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.ActiveCfg = Release|Win32 {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.Build.0 = Release|Win32 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.ActiveCfg = Release|x64 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.Build.0 = Release|x64 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.ActiveCfg = Debug|Win32 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.Build.0 = Debug|Win32 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.ActiveCfg = Debug|x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.Build.0 = Debug|x64 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.ActiveCfg = Release|Win32 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.Build.0 = Release|Win32 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.ActiveCfg = Release|x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.Build.0 = Release|x64 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.ActiveCfg = Debug|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.Build.0 = Debug|Win32 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.ActiveCfg = Debug|x64 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.Build.0 = Debug|x64 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.ActiveCfg = Release|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.Build.0 = Release|Win32 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.ActiveCfg = Release|x64 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.Build.0 = Release|x64 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.ActiveCfg = Debug|Win32 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.Build.0 = Debug|Win32 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.ActiveCfg = Debug|x64 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.Build.0 = Debug|x64 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.ActiveCfg = Release|Win32 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.Build.0 = Release|Win32 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.ActiveCfg = Release|x64 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.Build.0 = Release|x64 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.ActiveCfg = Debug|Win32 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.Build.0 = Debug|Win32 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.ActiveCfg = Debug|x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.Build.0 = Debug|x64 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.ActiveCfg = Release|Win32 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.Build.0 = Release|Win32 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.ActiveCfg = Release|x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.Build.0 = Release|x64 {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.ActiveCfg = Debug|Win32 {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.Build.0 = Debug|Win32 + {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.ActiveCfg = Debug|x64 + {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.Build.0 = Debug|x64 {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.ActiveCfg = Release|Win32 {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.Build.0 = Release|Win32 + {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.ActiveCfg = Release|x64 + {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.Build.0 = Release|x64 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.ActiveCfg = Debug|Win32 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.Build.0 = Debug|Win32 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.ActiveCfg = Debug|x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.Build.0 = Debug|x64 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.ActiveCfg = Release|Win32 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.Build.0 = Release|Win32 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.ActiveCfg = Release|x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.Build.0 = Release|x64 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.ActiveCfg = Debug|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.Build.0 = Debug|Win32 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.ActiveCfg = Debug|x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.Build.0 = Debug|x64 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.ActiveCfg = Release|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.Build.0 = Release|Win32 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.ActiveCfg = Release|x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.Build.0 = Release|x64 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.ActiveCfg = Debug|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.ActiveCfg = Debug|x64 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.Build.0 = Debug|x64 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.ActiveCfg = Release|x64 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.Build.0 = Release|x64 {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}.Debug|Win64.ActiveCfg = Debug|x64 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win64.Build.0 = Debug|x64 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.ActiveCfg = Release|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.Build.0 = Release|Win32 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.ActiveCfg = Release|x64 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.Build.0 = Release|x64 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.ActiveCfg = Debug|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.Build.0 = Debug|Win32 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.ActiveCfg = Debug|x64 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.Build.0 = Debug|x64 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.ActiveCfg = Release|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.ActiveCfg = Release|x64 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.Build.0 = Release|x64 {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}.Debug|Win64.ActiveCfg = Debug|x64 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win64.Build.0 = Debug|x64 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.Build.0 = Release|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.ActiveCfg = Release|x64 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj index 7a9b7b78c..77a2b103c 100644 --- a/lib/base/base.vcxproj +++ b/lib/base/base.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -20,7 +28,9 @@ Create + Create Create + Create @@ -86,29 +96,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + false true MultiByte DynamicLibrary + + false + true + MultiByte + DynamicLibrary + + + + + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -129,6 +172,25 @@ ws2_32.lib;shlwapi.lib + + + Disabled + _WINDLL;I2_BASE_BUILD;_DEBUG;%(PreprocessorDefinitions) + Level3 + false + i2-base.h + Use + true + + + Windows + true + ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies) + + + ws2_32.lib;shlwapi.lib + + Use @@ -153,6 +215,30 @@ ws2_32.lib;shlwapi.lib + + + Use + MaxSpeed + true + true + _WINDLL;I2_BASE_BUILD;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-base.h + true + + + Windows + true + true + true + ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies) + + + ws2_32.lib;shlwapi.lib + + diff --git a/lib/config/config.vcxproj b/lib/config/config.vcxproj index 4822a6d9a..a3b130973 100644 --- a/lib/config/config.vcxproj +++ b/lib/config/config.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -26,32 +34,46 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing Create + Create Create + Create config_lexer.cc + config_lexer.cc config_lexer.cc + config_lexer.cc win_flex "%(FullPath)" + win_flex "%(FullPath)" win_flex "%(FullPath)" + win_flex "%(FullPath)" Document win_bison -d "%(FullPath)" + win_bison -d "%(FullPath)" config_parser.cc config_parser.h + config_parser.cc config_parser.h win_bison -d "%(FullPath)" + win_bison -d "%(FullPath)" config_parser.cc config_parser.h + config_parser.cc config_parser.h Document @@ -66,29 +88,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + $(SolutionDir)\lib\base;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\lib\base;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -106,6 +161,22 @@ base.lib;%(AdditionalDependencies) + + + Use + Level3 + Disabled + _WINDLL;I2_CONFIG_BUILD;_DEBUG;%(PreprocessorDefinitions) + false + i2-config.h + true + + + Windows + true + base.lib;%(AdditionalDependencies) + + Level3 @@ -126,6 +197,26 @@ base.lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + _WINDLL;I2_CONFIG_BUILD;%(PreprocessorDefinitions) + false + i2-config.h + true + + + Windows + true + true + true + base.lib;%(AdditionalDependencies) + + diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 4843e3180..93159e0ba 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -16,7 +24,9 @@ Create + Create Create + Create @@ -51,31 +61,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -93,6 +138,22 @@ base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + + Use + Disabled + WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + false + i2-icinga.h + true + + + Console + true + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + Use @@ -114,6 +175,27 @@ base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + + Use + MaxSpeed + true + true + WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-icinga.h + true + + + Console + true + true + true + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + diff --git a/lib/remoting/remoting.vcxproj b/lib/remoting/remoting.vcxproj index be3cc84fb..1965c8a85 100644 --- a/lib/remoting/remoting.vcxproj +++ b/lib/remoting/remoting.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -25,7 +33,9 @@ Create + Create Create + Create @@ -44,29 +54,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) + $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -88,6 +131,26 @@ + + + Use + Disabled + WIN32;I2_REMOTING_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + i2-remoting.h + true + + + Windows + true + base.lib;config.lib;%(AdditionalDependencies) + + + + + + Use @@ -113,6 +176,31 @@ + + + Use + MaxSpeed + true + true + WIN32;I2_REMOTING_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-remoting.h + true + + + Windows + true + true + true + base.lib;config.lib;%(AdditionalDependencies) + + + + + + diff --git a/third-party/cJSON/cJSON.vcxproj b/third-party/cJSON/cJSON.vcxproj index fb1cad695..abce765aa 100644 --- a/third-party/cJSON/cJSON.vcxproj +++ b/third-party/cJSON/cJSON.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -27,23 +35,55 @@ true MultiByte + + StaticLibrary + true + MultiByte + StaticLibrary false true MultiByte + + StaticLibrary + false + true + MultiByte + + + + + + + - + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Disabled @@ -57,6 +97,19 @@ true + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + + MaxSpeed @@ -75,6 +128,24 @@ true + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + Speed + Level3 + false + true + + + Windows + true + true + true + + diff --git a/third-party/mmatch/mmatch.vcxproj b/third-party/mmatch/mmatch.vcxproj index c65e344f5..7cf5ac191 100644 --- a/third-party/mmatch/mmatch.vcxproj +++ b/third-party/mmatch/mmatch.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -27,23 +35,55 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false true Unicode + + StaticLibrary + false + true + Unicode + + + + + + + - + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Disabled @@ -57,6 +97,19 @@ true + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + + MaxSpeed @@ -74,6 +127,23 @@ true + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + true + true + +