diff --git a/.gitignore b/.gitignore index 81e9d0fac..cff079849 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ m4/ylwrap m4/test-driver icinga2-*.tar.gz icinga2.spec +packages \ No newline at end of file diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index 5f93d8de0..539e58e63 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -160,7 +165,6 @@ - @@ -187,7 +191,22 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/checker/checker.vcxproj.filters b/components/checker/checker.vcxproj.filters index d5458f8d8..571eb2d8b 100644 --- a/components/checker/checker.vcxproj.filters +++ b/components/checker/checker.vcxproj.filters @@ -11,9 +11,6 @@ - - Headerdateien - Headerdateien @@ -31,4 +28,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/components/checker/packages.config b/components/checker/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/checker/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/cluster/cluster.vcxproj b/components/cluster/cluster.vcxproj index 4b1da3c51..ee5bacb28 100644 --- a/components/cluster/cluster.vcxproj +++ b/components/cluster/cluster.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -20,12 +21,12 @@ - + - + @@ -50,6 +51,9 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + {8732E0CD-E3D0-41F2-A538-94884543890F} Win32Proj @@ -60,23 +64,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -192,5 +200,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/components/cluster/cluster.vcxproj.filters b/components/cluster/cluster.vcxproj.filters index 1738de41b..fdb66804f 100644 --- a/components/cluster/cluster.vcxproj.filters +++ b/components/cluster/cluster.vcxproj.filters @@ -9,9 +9,6 @@ - - Quelldateien - Quelldateien @@ -21,21 +18,27 @@ Quelldateien + + Quelldateien + - - Headerdateien - Headerdateien Headerdateien + + Headerdateien + Quelldateien + + + \ No newline at end of file diff --git a/components/cluster/packages.config b/components/cluster/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/cluster/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj index c782d0275..10e3cd000 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ DynamicLibrary true NotSet + v110 DynamicLibrary true NotSet + v110 DynamicLibrary false true NotSet + v110 DynamicLibrary false true NotSet + v110 @@ -157,12 +162,11 @@ + - - - - - + + + @@ -185,7 +189,28 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/compat/compat.vcxproj.filters b/components/compat/compat.vcxproj.filters index bf36e4f87..2f561cf1b 100644 --- a/components/compat/compat.vcxproj.filters +++ b/components/compat/compat.vcxproj.filters @@ -11,18 +11,19 @@ - - Headerdateien - - - Headerdateien - - - - + Quelldateien - + + Quelldateien + + + Quelldateien + + + Quelldateien + + Quelldateien @@ -31,4 +32,21 @@ Quelldateien + + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + \ No newline at end of file diff --git a/components/compat/compatlogger.cpp b/components/compat/compatlogger.cpp index 396f20034..7ce65879c 100644 --- a/components/compat/compatlogger.cpp +++ b/components/compat/compatlogger.cpp @@ -57,7 +57,7 @@ void CompatLogger::Start(void) Service::OnFlappingChanged.connect(bind(&CompatLogger::FlappingHandler, this, _1, _2)); Service::OnDowntimeTriggered.connect(boost::bind(&CompatLogger::TriggerDowntimeHandler, this, _1, _2)); Service::OnDowntimeRemoved.connect(boost::bind(&CompatLogger::RemoveDowntimeHandler, this, _1, _2)); - ExternalCommandProcessor::OnNewExternalCommand.connect(bind(&CompatLogger::ExternalCommandHandler, this, _2, _3)); + ExternalCommandProcessor::OnNewExternalCommand.connect(boost::bind(&CompatLogger::ExternalCommandHandler, this, _2, _3)); m_RotationTimer = boost::make_shared(); m_RotationTimer->OnTimerExpired.connect(boost::bind(&CompatLogger::RotationTimerHandler, this)); diff --git a/components/compat/packages.config b/components/compat/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/compat/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/db_ido_mysql/ido_mysql.vcxproj b/components/db_ido_mysql/db_ido_mysql.vcxproj similarity index 79% rename from components/db_ido_mysql/ido_mysql.vcxproj rename to components/db_ido_mysql/db_ido_mysql.vcxproj index fcf55e5d2..7630e0157 100644 --- a/components/db_ido_mysql/ido_mysql.vcxproj +++ b/components/db_ido_mysql/db_ido_mysql.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -19,7 +20,7 @@ - {2E6C1133-730F-4875-A72C-B455B1DD4C5C} + {273A9D62-F556-4B5E-B235-B608106CB028} Win32Proj demo @@ -28,23 +29,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -159,15 +164,14 @@ - - + - - + + - + Document "$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp" Preparing config fragment for embedding @@ -187,7 +191,22 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/db_ido_mysql/ido_mysql.vcxproj.filters b/components/db_ido_mysql/db_ido_mysql.vcxproj.filters similarity index 73% rename from components/db_ido_mysql/ido_mysql.vcxproj.filters rename to components/db_ido_mysql/db_ido_mysql.vcxproj.filters index 922435a52..3619115b1 100644 --- a/components/db_ido_mysql/ido_mysql.vcxproj.filters +++ b/components/db_ido_mysql/db_ido_mysql.vcxproj.filters @@ -1,10 +1,7 @@  - - Headerdateien - - + Headerdateien @@ -17,15 +14,18 @@ - + Quelldateien - + Quelldateien - + + + + Quelldateien diff --git a/components/db_ido_mysql/packages.config b/components/db_ido_mysql/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/db_ido_mysql/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index 167f0ccd7..6aca3d0fe 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -158,13 +163,9 @@ base.lib;config.lib;icinga.lib;%(AdditionalDependencies) - - - - - + @@ -187,7 +188,25 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/demo/demo.vcxproj.filters b/components/demo/demo.vcxproj.filters index 922435a52..f7e1bf626 100644 --- a/components/demo/demo.vcxproj.filters +++ b/components/demo/demo.vcxproj.filters @@ -1,13 +1,5 @@  - - - Headerdateien - - - Headerdateien - - {11a495bf-a705-4766-b3d3-9b5db266a6ef} @@ -17,10 +9,10 @@ - + Quelldateien - + Quelldateien @@ -29,4 +21,12 @@ Quelldateien + + + + + + Headerdateien + + \ No newline at end of file diff --git a/components/demo/packages.config b/components/demo/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/demo/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj index fcb009c30..2cf7c1afd 100644 --- a/components/livestatus/livestatus.vcxproj +++ b/components/livestatus/livestatus.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -21,6 +22,7 @@ + @@ -40,8 +42,6 @@ - - @@ -62,7 +62,6 @@ - @@ -71,6 +70,7 @@ + @@ -107,6 +107,9 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F} Win32Proj @@ -117,23 +120,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -249,5 +256,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/components/livestatus/livestatus.vcxproj.filters b/components/livestatus/livestatus.vcxproj.filters index 1ba8ddafc..13389a512 100644 --- a/components/livestatus/livestatus.vcxproj.filters +++ b/components/livestatus/livestatus.vcxproj.filters @@ -9,12 +9,6 @@ - - Headerdateien - - - Headerdateien - Headerdateien @@ -108,11 +102,11 @@ Headerdateien + + Headerdateien + - - Quelldateien - Quelldateien @@ -206,10 +200,16 @@ Quelldateien + + Quelldateien + Quelldateien + + + \ No newline at end of file diff --git a/components/livestatus/packages.config b/components/livestatus/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/livestatus/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/notification/notification.vcxproj b/components/notification/notification.vcxproj index d21f7cbab..3afe88784 100644 --- a/components/notification/notification.vcxproj +++ b/components/notification/notification.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -160,7 +165,6 @@ - @@ -187,7 +191,22 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/notification/notification.vcxproj.filters b/components/notification/notification.vcxproj.filters index 2106ca98c..1ffc78356 100644 --- a/components/notification/notification.vcxproj.filters +++ b/components/notification/notification.vcxproj.filters @@ -4,9 +4,6 @@ Headerdateien - - Headerdateien - @@ -29,4 +26,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/components/notification/packages.config b/components/notification/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/components/notification/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index dd72983a0..9bc1ab8cc 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -21,6 +22,9 @@ + + + {BE412865-FEBA-4259-AD41-58950D1F5432} Win32Proj @@ -32,23 +36,27 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false true MultiByte + v110 Application false true MultiByte + v110 @@ -166,5 +174,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/icinga-app/icinga-app.vcxproj.filters b/icinga-app/icinga-app.vcxproj.filters index 9cd09d6ae..2b935b52e 100644 --- a/icinga-app/icinga-app.vcxproj.filters +++ b/icinga-app/icinga-app.vcxproj.filters @@ -13,4 +13,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/icinga-app/packages.config b/icinga-app/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/icinga-app/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icinga2.sln b/icinga2.sln index c0199d279..765d15e2f 100644 --- a/icinga2.sln +++ b/icinga2.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\icinga-app.vcxproj", "{BE412865-FEBA-4259-AD41-58950D1F5432}" ProjectSection(ProjectDependencies) = postProject {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} = {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} @@ -95,8 +95,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cluster", "components\clust {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ido", "lib\ido\ido.vcxproj", "{87BBCE4C-36F5-4C04-90FB-9B74618AF988}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_ido_mysql", "components\db_ido_mysql\db_ido_mysql.vcxproj", "{273A9D62-F556-4B5E-B235-B608106CB028}" ProjectSection(ProjectDependencies) = postProject + {87BBCE4C-36F5-4C04-90FB-9B74618AF988} = {87BBCE4C-36F5-4C04-90FB-9B74618AF988} + {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 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_ido", "lib\db_ido\db_ido.vcxproj", "{87BBCE4C-36F5-4C04-90FB-9B74618AF988}" + 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} @@ -278,6 +288,16 @@ Global {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|Win64.ActiveCfg = Release|Win32 {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.ActiveCfg = Release|x64 {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.Build.0 = Release|x64 + {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win32.ActiveCfg = Debug|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win32.Build.0 = Debug|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win64.ActiveCfg = Debug|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|x64.ActiveCfg = Debug|x64 + {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|x64.Build.0 = Debug|x64 + {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win32.ActiveCfg = Release|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win32.Build.0 = Release|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win64.ActiveCfg = Release|Win32 + {273A9D62-F556-4B5E-B235-B608106CB028}.Release|x64.ActiveCfg = Release|x64 + {273A9D62-F556-4B5E-B235-B608106CB028}.Release|x64.Build.0 = Release|x64 {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.ActiveCfg = Debug|Win32 {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.Build.0 = Debug|Win32 {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win64.ActiveCfg = Debug|Win32 @@ -299,6 +319,7 @@ Global {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {4A1773FD-DDED-4952-8700-C898E890554A} {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} {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/base/application.cpp b/lib/base/application.cpp index 3ba47522a..c0687ce4c 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -39,6 +39,10 @@ #include #include +#ifndef _WIN32 +# include "icinga-version.h" +#endif /* _WIN32 */ + using namespace icinga; Application *Application::m_Instance = NULL; @@ -708,5 +712,9 @@ ThreadPool& Application::GetTP(void) String Application::GetVersion(void) { - return ICINGA_VERSION; +#ifndef _WIN32 + return VERSION ", " GIT_MESSAGE; +#else /* _WIN32 */ + return "unspecified version"; +#endif /* _WIN32 */ } diff --git a/lib/base/application.h b/lib/base/application.h index 878fd3aa9..9a5c302e1 100644 --- a/lib/base/application.h +++ b/lib/base/application.h @@ -23,8 +23,6 @@ #include "base/i2-base.h" #include "base/threadpool.h" #include "base/dynamicobject.h" -#include "icinga-version.h" -#define ICINGA_VERSION VERSION ", " GIT_MESSAGE namespace icinga { diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj index b779f7aaf..f68d71ca7 100644 --- a/lib/base/base.vcxproj +++ b/lib/base/base.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -112,6 +113,9 @@ + + + {9C92DA90-FD53-43A9-A244-90F2E8AF9677} Win32Proj @@ -122,23 +126,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 false true MultiByte DynamicLibrary + v110 false true MultiByte DynamicLibrary + v110 @@ -193,7 +201,7 @@ Windows true - dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies) + dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies) ws2_32.lib;shlwapi.lib @@ -236,7 +244,7 @@ true true true - dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies) + dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies) ws2_32.lib;shlwapi.lib @@ -268,5 +276,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters index b9c12fd4d..ac97bf4aa 100644 --- a/lib/base/base.vcxproj.filters +++ b/lib/base/base.vcxproj.filters @@ -282,4 +282,7 @@ {7bbee99c-5763-4063-836c-ddbcc8966ae3} + + + \ No newline at end of file diff --git a/lib/base/packages.config b/lib/base/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/lib/base/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/base/win32.h b/lib/base/win32.h index 04a5620fc..728357d52 100644 --- a/lib/base/win32.h +++ b/lib/base/win32.h @@ -28,6 +28,8 @@ #include #include +#include + #ifdef __MINGW32__ # ifndef IPV6_V6ONLY # define IPV6_V6ONLY 27 diff --git a/lib/config/.gitignore b/lib/config/.gitignore index e8c1bf777..07c4f5e76 100644 --- a/lib/config/.gitignore +++ b/lib/config/.gitignore @@ -1 +1,5 @@ base-type.cpp +config_lexer.cc +config_parser.cc +config_parser.h +config_parser.hh \ No newline at end of file diff --git a/lib/config/config.vcxproj b/lib/config/config.vcxproj index 3b2e46bfa..36acd56bc 100644 --- a/lib/config/config.vcxproj +++ b/lib/config/config.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -85,28 +86,51 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c - + 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)" + win_flex "%(FullPath)" +del config_lexer.cc +ren lex.yy.c config_lexer.cc + win_flex "%(FullPath)" +del config_lexer.cc +ren lex.yy.c config_lexer.cc + win_flex "%(FullPath)" +del config_lexer.cc +ren lex.yy.c config_lexer.cc + win_flex "%(FullPath)" +del config_lexer.cc +ren lex.yy.c config_lexer.cc + + + win_bison -d "%(FullPath)" +del config_parser.cc +ren config_parser.tab.cc config_parser.cc +del config_parser.h +ren config_parser.tab.hh config_parser.h + win_bison -d "%(FullPath)" +del config_parser.cc +ren config_parser.tab.cc config_parser.cc +del config_parser.h +ren config_parser.tab.hh config_parser.h config_parser.cc config_parser.h config_parser.cc config_parser.h - win_bison -d "%(FullPath)" - win_bison -d "%(FullPath)" + win_bison -d "%(FullPath)" +del config_parser.cc +ren config_parser.tab.cc config_parser.cc +del config_parser.h +ren config_parser.tab.hh config_parser.h + win_bison -d "%(FullPath)" +del config_parser.cc +ren config_parser.tab.cc config_parser.cc +del config_parser.h +ren config_parser.tab.hh config_parser.h config_parser.cc config_parser.h config_parser.cc config_parser.h - Document - + + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} @@ -118,23 +142,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -250,5 +278,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/config/config.vcxproj.filters b/lib/config/config.vcxproj.filters index 49c92f108..624ef3131 100644 --- a/lib/config/config.vcxproj.filters +++ b/lib/config/config.vcxproj.filters @@ -77,12 +77,7 @@ - - Quelldateien - - - Quelldateien - + @@ -96,5 +91,11 @@ Quelldateien + + Quelldateien + + + Quelldateien + \ No newline at end of file diff --git a/lib/config/packages.config b/lib/config/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/lib/config/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/db_ido/ido.vcxproj b/lib/db_ido/db_ido.vcxproj similarity index 82% rename from lib/db_ido/ido.vcxproj rename to lib/db_ido/db_ido.vcxproj index 79ddf52f6..2f012b5ec 100644 --- a/lib/db_ido/ido.vcxproj +++ b/lib/db_ido/db_ido.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,7 +29,7 @@ - + @@ -52,7 +53,7 @@ - + Document "$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp" "$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp" @@ -72,6 +73,9 @@ %(Filename).cpp;%(Outputs) + + + {87BBCE4C-36F5-4C04-90FB-9B74618AF988} Win32Proj @@ -82,23 +86,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -214,5 +222,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/db_ido/ido.vcxproj.filters b/lib/db_ido/db_ido.vcxproj.filters similarity index 95% rename from lib/db_ido/ido.vcxproj.filters rename to lib/db_ido/db_ido.vcxproj.filters index f6e4a8ea5..143c5ec82 100644 --- a/lib/db_ido/ido.vcxproj.filters +++ b/lib/db_ido/db_ido.vcxproj.filters @@ -51,7 +51,7 @@ Quelldateien - + Quelldateien @@ -100,7 +100,10 @@ - + + + + Quelldateien diff --git a/lib/db_ido/packages.config b/lib/db_ido/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/lib/db_ido/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 8f037ff3c..997a97d1f 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -108,6 +109,9 @@ $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + + + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} Win32Proj @@ -119,23 +123,27 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false true MultiByte + v110 DynamicLibrary false true MultiByte + v110 @@ -194,7 +202,7 @@ Console true - base.lib;config.lib;%(AdditionalDependencies) + base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) @@ -210,7 +218,7 @@ Console true - base.lib;config.lib;%(AdditionalDependencies) + base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) @@ -231,7 +239,7 @@ true true true - base.lib;config.lib;%(AdditionalDependencies) + base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) @@ -252,10 +260,22 @@ true true true - base.lib;config.lib;%(AdditionalDependencies) + base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters index 959dc8e2a..be841daac 100644 --- a/lib/icinga/icinga.vcxproj.filters +++ b/lib/icinga/icinga.vcxproj.filters @@ -197,4 +197,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/lib/icinga/packages.config b/lib/icinga/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/lib/icinga/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/repositories.config b/packages/repositories.config new file mode 100644 index 000000000..d853c3108 --- /dev/null +++ b/packages/repositories.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/packages.config b/test/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/test/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/test.vcxproj b/test/test.vcxproj index 39476a28a..18dd2e317 100644 --- a/test/test.vcxproj +++ b/test/test.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false true MultiByte + v110 Application false true MultiByte + v110 @@ -169,7 +174,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters index 7ad20b45b..bb4ed7cb3 100644 --- a/test/test.vcxproj.filters +++ b/test/test.vcxproj.filters @@ -43,4 +43,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/third-party/cJSON/cJSON.vcxproj b/third-party/cJSON/cJSON.vcxproj index c12ea5970..f8d40d2c2 100644 --- a/third-party/cJSON/cJSON.vcxproj +++ b/third-party/cJSON/cJSON.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -24,6 +25,9 @@ + + + {66BED474-C33F-48F9-90BA-BBCFEDC006B8} Win32Proj @@ -34,23 +38,27 @@ StaticLibrary true MultiByte + v110 StaticLibrary true MultiByte + v110 StaticLibrary false true MultiByte + v110 StaticLibrary false true MultiByte + v110 @@ -156,5 +164,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/third-party/cJSON/cJSON.vcxproj.filters b/third-party/cJSON/cJSON.vcxproj.filters index aca8c6a15..6465e0e0c 100644 --- a/third-party/cJSON/cJSON.vcxproj.filters +++ b/third-party/cJSON/cJSON.vcxproj.filters @@ -18,4 +18,7 @@ Headerdateien + + + \ No newline at end of file diff --git a/third-party/cJSON/packages.config b/third-party/cJSON/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/third-party/cJSON/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third-party/mmatch/mmatch.vcxproj b/third-party/mmatch/mmatch.vcxproj index fc656a5fe..77d0b10c1 100644 --- a/third-party/mmatch/mmatch.vcxproj +++ b/third-party/mmatch/mmatch.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -24,6 +25,9 @@ + + + {19CBCE06-3F5C-479A-BD75-E2AB6215D345} Win32Proj @@ -34,23 +38,27 @@ StaticLibrary true Unicode + v110 StaticLibrary true Unicode + v110 StaticLibrary false true Unicode + v110 StaticLibrary false true Unicode + v110 @@ -154,5 +162,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/third-party/mmatch/mmatch.vcxproj.filters b/third-party/mmatch/mmatch.vcxproj.filters index 52551b3fb..3adbbe12b 100644 --- a/third-party/mmatch/mmatch.vcxproj.filters +++ b/third-party/mmatch/mmatch.vcxproj.filters @@ -18,4 +18,7 @@ Headerdateien + + + \ No newline at end of file diff --git a/third-party/mmatch/packages.config b/third-party/mmatch/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/third-party/mmatch/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/mkembedconfig/mkembedconfig.vcxproj b/tools/mkembedconfig/mkembedconfig.vcxproj index 797aec9a8..054093097 100644 --- a/tools/mkembedconfig/mkembedconfig.vcxproj +++ b/tools/mkembedconfig/mkembedconfig.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -28,23 +29,27 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false true MultiByte + v110 Application false true MultiByte + v110 @@ -141,7 +146,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/mkembedconfig/mkembedconfig.vcxproj.filters b/tools/mkembedconfig/mkembedconfig.vcxproj.filters index 4ef62086c..d46f1b9b3 100644 --- a/tools/mkembedconfig/mkembedconfig.vcxproj.filters +++ b/tools/mkembedconfig/mkembedconfig.vcxproj.filters @@ -19,4 +19,7 @@ Quelldateien + + + \ No newline at end of file diff --git a/tools/mkembedconfig/packages.config b/tools/mkembedconfig/packages.config new file mode 100644 index 000000000..63dced53b --- /dev/null +++ b/tools/mkembedconfig/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file