From d703f80e625c9fdf0f84df6c345e820470f33425 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 15 Jul 2012 13:13:19 +0200 Subject: [PATCH] Enabled pre-compiled headers for Windows builds. --- base/base.vcxproj | 14 +++++++------ base/base.vcxproj.filters | 3 +++ base/i2-base.cpp | 22 ++++++++++++++++++++ base/sysloglogger.cpp | 2 +- base/unix.cpp | 2 +- base/win32.cpp | 2 +- cJSON/cJSON.vcxproj.filters | 9 ++++++++ cib/cib.vcxproj | 12 +++++++---- cib/cib.vcxproj.filters | 3 +++ cib/i2-cib.cpp | 22 ++++++++++++++++++++ components/checker/checker.vcxproj | 6 ------ components/cibsync/cibsync.vcxproj | 4 ---- components/compat/compat.vcxproj | 4 ---- components/configfile/configfile.vcxproj | 6 ------ components/convenience/convenience.vcxproj | 4 ---- components/delegation/delegation.vcxproj | 6 ------ components/demo/demo.vcxproj | 6 ------ components/discovery/discovery.vcxproj | 6 ------ dyn/dyn.vcxproj | 24 ++++++++++++++-------- dyn/dyn.vcxproj.filters | 3 +++ dyn/i2-dyn.cpp | 22 ++++++++++++++++++++ icinga-app/icinga-app.vcxproj | 6 ------ icinga/i2-icinga.cpp | 22 ++++++++++++++++++++ icinga/icinga.vcxproj | 14 +++++++------ icinga/icinga.vcxproj.filters | 3 +++ jsonrpc/i2-jsonrpc.cpp | 22 ++++++++++++++++++++ jsonrpc/jsonrpc.vcxproj | 14 +++++++------ jsonrpc/jsonrpc.vcxproj.filters | 3 +++ third-party/cJSON/cJSON.vcxproj | 6 ------ third-party/mmatch/mmatch.vcxproj | 6 ------ 30 files changed, 185 insertions(+), 93 deletions(-) create mode 100644 base/i2-base.cpp create mode 100644 cJSON/cJSON.vcxproj.filters create mode 100644 cib/i2-cib.cpp create mode 100644 dyn/i2-dyn.cpp create mode 100644 icinga/i2-icinga.cpp create mode 100644 jsonrpc/i2-jsonrpc.cpp diff --git a/base/base.vcxproj b/base/base.vcxproj index 35d0bffc3..4a74c2ea3 100644 --- a/base/base.vcxproj +++ b/base/base.vcxproj @@ -19,6 +19,10 @@ + + Create + Create + @@ -110,13 +114,12 @@ - - Disabled _WINDLL;I2_BASE_BUILD;_DEBUG;%(PreprocessorDefinitions) Level3 - true false + i2-base.h + Use Windows @@ -129,16 +132,15 @@ - - + Use MaxSpeed true true _WINDLL;I2_BASE_BUILD;%(PreprocessorDefinitions) Speed Level3 - true false + i2-base.h Windows diff --git a/base/base.vcxproj.filters b/base/base.vcxproj.filters index d871a78cf..771177581 100644 --- a/base/base.vcxproj.filters +++ b/base/base.vcxproj.filters @@ -88,6 +88,9 @@ Quelldateien + + Quelldateien + diff --git a/base/i2-base.cpp b/base/i2-base.cpp new file mode 100644 index 000000000..c66f624b1 --- /dev/null +++ b/base/i2-base.cpp @@ -0,0 +1,22 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/* This file is used by MSVC to generate the pre-compiled hedader. */ + +#include "i2-base.h" diff --git a/base/sysloglogger.cpp b/base/sysloglogger.cpp index 06dc19733..96ead4b24 100644 --- a/base/sysloglogger.cpp +++ b/base/sysloglogger.cpp @@ -1,6 +1,6 @@ -#ifndef _WIN32 #include "i2-base.h" +#ifndef _WIN32 using namespace icinga; /** diff --git a/base/unix.cpp b/base/unix.cpp index 83c2a864f..8997e814e 100644 --- a/base/unix.cpp +++ b/base/unix.cpp @@ -17,9 +17,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#ifndef _WIN32 #include "i2-base.h" +#ifndef _WIN32 #include using namespace icinga; diff --git a/base/win32.cpp b/base/win32.cpp index 9ccc89c4c..51dbadc90 100644 --- a/base/win32.cpp +++ b/base/win32.cpp @@ -17,9 +17,9 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#ifdef _WIN32 #include "i2-base.h" +#ifdef _WIN32 using namespace icinga; /* nothing here (yet) */ diff --git a/cJSON/cJSON.vcxproj.filters b/cJSON/cJSON.vcxproj.filters new file mode 100644 index 000000000..0296d380f --- /dev/null +++ b/cJSON/cJSON.vcxproj.filters @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/cib/cib.vcxproj b/cib/cib.vcxproj index 6e9dea9e0..4045869aa 100644 --- a/cib/cib.vcxproj +++ b/cib/cib.vcxproj @@ -49,11 +49,11 @@ - - + Use Level3 Disabled _WINDLL;I2_CIB_BUILD;_DEBUG;%(PreprocessorDefinitions) + i2-cib.h Windows @@ -64,12 +64,12 @@ Level3 - - + Use MaxSpeed true true _WINDLL;I2_CIB_BUILD;%(PreprocessorDefinitions) + i2-cib.h Windows @@ -98,6 +98,10 @@ + + Create + Create + diff --git a/cib/cib.vcxproj.filters b/cib/cib.vcxproj.filters index cbd13955a..049b0d688 100644 --- a/cib/cib.vcxproj.filters +++ b/cib/cib.vcxproj.filters @@ -76,5 +76,8 @@ Quelldateien + + Quelldateien + \ No newline at end of file diff --git a/cib/i2-cib.cpp b/cib/i2-cib.cpp new file mode 100644 index 000000000..b5aad24ba --- /dev/null +++ b/cib/i2-cib.cpp @@ -0,0 +1,22 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/* This file is used by MSVC to generate the pre-compiled hedader. */ + +#include "i2-cib.h" diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index e40c920ff..3524b7e0e 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -49,12 +49,9 @@ - - Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) - true false @@ -66,13 +63,10 @@ Level3 - - MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) - true false diff --git a/components/cibsync/cibsync.vcxproj b/components/cibsync/cibsync.vcxproj index 8c9299230..76c6163c0 100644 --- a/components/cibsync/cibsync.vcxproj +++ b/components/cibsync/cibsync.vcxproj @@ -49,8 +49,6 @@ - - Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;CIBSYNC_EXPORTS;%(PreprocessorDefinitions) @@ -64,8 +62,6 @@ Level3 - - MaxSpeed true true diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj index a8b46b944..70ffb3769 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -49,8 +49,6 @@ - - Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) @@ -64,8 +62,6 @@ Level3 - - MaxSpeed true true diff --git a/components/configfile/configfile.vcxproj b/components/configfile/configfile.vcxproj index a4061b5a1..86147b6cf 100644 --- a/components/configfile/configfile.vcxproj +++ b/components/configfile/configfile.vcxproj @@ -54,12 +54,9 @@ - - Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) Level3 - true false @@ -74,15 +71,12 @@ - - MaxSpeed true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed Level3 - true false diff --git a/components/convenience/convenience.vcxproj b/components/convenience/convenience.vcxproj index cf3269756..d8afa0c1b 100644 --- a/components/convenience/convenience.vcxproj +++ b/components/convenience/convenience.vcxproj @@ -49,8 +49,6 @@ - - Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;CONVENIENCE_EXPORTS;%(PreprocessorDefinitions) @@ -64,8 +62,6 @@ Level3 - - MaxSpeed true true diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj index 6f5b7a277..6b62383bf 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -49,12 +49,9 @@ - - Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) - true false @@ -66,13 +63,10 @@ Level3 - - MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) - true false diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index 8fb54b5b1..ce31dbb7d 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -49,12 +49,9 @@ - - Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) Level3 - true false @@ -65,14 +62,11 @@ - - MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) Level3 - true false diff --git a/components/discovery/discovery.vcxproj b/components/discovery/discovery.vcxproj index 932c83f99..b675fe27b 100644 --- a/components/discovery/discovery.vcxproj +++ b/components/discovery/discovery.vcxproj @@ -49,12 +49,9 @@ - - Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;DISCOVERY_EXPORTS;%(PreprocessorDefinitions) Level3 - true false @@ -65,14 +62,11 @@ - - MaxSpeed true true WIN32;NDEBUG;_WINDOWS;_USRDLL;DISCOVERY_EXPORTS;%(PreprocessorDefinitions) Level3 - true false diff --git a/dyn/dyn.vcxproj b/dyn/dyn.vcxproj index 034c07f5f..e1c781d2d 100644 --- a/dyn/dyn.vcxproj +++ b/dyn/dyn.vcxproj @@ -24,10 +24,20 @@ - - + + NotUsing + NotUsing + + + NotUsing + NotUsing + + + Create + Create + @@ -82,13 +92,12 @@ - - + Use Level3 Disabled _WINDLL;I2_DYN_BUILD;_DEBUG;%(PreprocessorDefinitions) - true false + i2-dyn.h Windows @@ -99,14 +108,13 @@ Level3 - - + Use MaxSpeed true true _WINDLL;I2_DYN_BUILD;%(PreprocessorDefinitions) - true false + i2-dyn.h Windows diff --git a/dyn/dyn.vcxproj.filters b/dyn/dyn.vcxproj.filters index a0bafef91..a73d7f2a3 100644 --- a/dyn/dyn.vcxproj.filters +++ b/dyn/dyn.vcxproj.filters @@ -22,6 +22,9 @@ Quelldateien + + Quelldateien + diff --git a/dyn/i2-dyn.cpp b/dyn/i2-dyn.cpp new file mode 100644 index 000000000..4dc432ca6 --- /dev/null +++ b/dyn/i2-dyn.cpp @@ -0,0 +1,22 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/* This file is used by MSVC to generate the pre-compiled hedader. */ + +#include "i2-dyn.h" diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index ebde93fee..02fbf8ccd 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -53,12 +53,9 @@ - - Disabled WIN32;I2_ICINGALAUNCHER_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - true false @@ -69,15 +66,12 @@ - - MaxSpeed true true WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Speed Level3 - true false diff --git a/icinga/i2-icinga.cpp b/icinga/i2-icinga.cpp new file mode 100644 index 000000000..ae6e8fae3 --- /dev/null +++ b/icinga/i2-icinga.cpp @@ -0,0 +1,22 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/* This file is used by MSVC to generate the pre-compiled hedader. */ + +#include "i2-icinga.h" diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj index 808bf3170..d5bc7d787 100644 --- a/icinga/icinga.vcxproj +++ b/icinga/icinga.vcxproj @@ -13,6 +13,10 @@ + + Create + Create + @@ -65,13 +69,12 @@ - - + Use Disabled WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - true false + i2-icinga.h Console @@ -81,16 +84,15 @@ - - + Use MaxSpeed true true WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Speed Level3 - true false + i2-icinga.h Console diff --git a/icinga/icinga.vcxproj.filters b/icinga/icinga.vcxproj.filters index 83cda4e0e..b27aaf467 100644 --- a/icinga/icinga.vcxproj.filters +++ b/icinga/icinga.vcxproj.filters @@ -16,6 +16,9 @@ Quelldateien + + Quelldateien + diff --git a/jsonrpc/i2-jsonrpc.cpp b/jsonrpc/i2-jsonrpc.cpp new file mode 100644 index 000000000..5a10b33f3 --- /dev/null +++ b/jsonrpc/i2-jsonrpc.cpp @@ -0,0 +1,22 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/* This file is used by MSVC to generate the pre-compiled hedader. */ + +#include "i2-jsonrpc.h" diff --git a/jsonrpc/jsonrpc.vcxproj b/jsonrpc/jsonrpc.vcxproj index 7ea643878..d5354a235 100644 --- a/jsonrpc/jsonrpc.vcxproj +++ b/jsonrpc/jsonrpc.vcxproj @@ -20,6 +20,10 @@ + + Create + Create + @@ -64,13 +68,12 @@ - - + Use Disabled WIN32;I2_JSONRPC_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions) Level3 - true false + i2-jsonrpc.h Windows @@ -84,16 +87,15 @@ - - + Use MaxSpeed true true WIN32;I2_JSONRPC_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed Level3 - true false + i2-jsonrpc.h Windows diff --git a/jsonrpc/jsonrpc.vcxproj.filters b/jsonrpc/jsonrpc.vcxproj.filters index 6878f2c8a..f2a1ea9d0 100644 --- a/jsonrpc/jsonrpc.vcxproj.filters +++ b/jsonrpc/jsonrpc.vcxproj.filters @@ -19,6 +19,9 @@ Quelldateien + + Quelldateien + diff --git a/third-party/cJSON/cJSON.vcxproj b/third-party/cJSON/cJSON.vcxproj index b045931a1..ddedbb92d 100644 --- a/third-party/cJSON/cJSON.vcxproj +++ b/third-party/cJSON/cJSON.vcxproj @@ -46,12 +46,9 @@ - - Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) Level3 - true false @@ -61,15 +58,12 @@ - - MaxSpeed true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Speed Level3 - true false diff --git a/third-party/mmatch/mmatch.vcxproj b/third-party/mmatch/mmatch.vcxproj index b6766c1e9..becd3845b 100644 --- a/third-party/mmatch/mmatch.vcxproj +++ b/third-party/mmatch/mmatch.vcxproj @@ -46,12 +46,9 @@ - - Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) Level3 - true false @@ -61,14 +58,11 @@ - - MaxSpeed true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Level3 - true false