From 05a6303f82c82d7dffe0315b7c0e9b708f0acc4c Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 13 Apr 2012 11:45:09 +0200 Subject: [PATCH] Build fixes for Windows. --- Makefile.am | 4 +- configure.ac | 2 +- icinga-app/Makefile.am | 21 +++++ icinga-app/icinga-app.vcxproj | 89 +++++++++++++++++++ {icinga => icinga-app}/icinga.cpp | 0 icinga.sln | 25 +++--- icinga/Makefile.am | 26 ++++-- {libicinga => icinga}/endpoint.cpp | 0 {libicinga => icinga}/endpoint.h | 0 {libicinga => icinga}/endpointmanager.cpp | 0 {libicinga => icinga}/endpointmanager.h | 0 {libicinga => icinga}/i2-icinga.h | 0 .../icinga.vcxproj | 34 +++---- {libicinga => icinga}/icingaapplication.cpp | 0 {libicinga => icinga}/icingaapplication.h | 0 {libicinga => icinga}/jsonrpcendpoint.cpp | 0 {libicinga => icinga}/jsonrpcendpoint.h | 0 {libicinga => icinga}/virtualendpoint.cpp | 0 {libicinga => icinga}/virtualendpoint.h | 0 libicinga/Makefile.am | 29 ------ 20 files changed, 160 insertions(+), 70 deletions(-) create mode 100644 icinga-app/Makefile.am create mode 100644 icinga-app/icinga-app.vcxproj rename {icinga => icinga-app}/icinga.cpp (100%) rename {libicinga => icinga}/endpoint.cpp (100%) rename {libicinga => icinga}/endpoint.h (100%) rename {libicinga => icinga}/endpointmanager.cpp (100%) rename {libicinga => icinga}/endpointmanager.h (100%) rename {libicinga => icinga}/i2-icinga.h (100%) rename libicinga/libicinga.vcxproj => icinga/icinga.vcxproj (97%) rename {libicinga => icinga}/icingaapplication.cpp (100%) rename {libicinga => icinga}/icingaapplication.h (100%) rename {libicinga => icinga}/jsonrpcendpoint.cpp (100%) rename {libicinga => icinga}/jsonrpcendpoint.h (100%) rename {libicinga => icinga}/virtualendpoint.cpp (100%) rename {libicinga => icinga}/virtualendpoint.h (100%) delete mode 100644 libicinga/Makefile.am diff --git a/Makefile.am b/Makefile.am index 678cfc2f4..71442f08e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,8 @@ SUBDIRS = ltdl \ base \ cJSON \ jsonrpc \ - libicinga \ - icinga \ + icinga \ + icinga-app \ configfilecomponent \ configrpccomponent diff --git a/configure.ac b/configure.ac index b4532d723..c811fe7ae 100644 --- a/configure.ac +++ b/configure.ac @@ -46,8 +46,8 @@ base/Makefile cJSON/Makefile configfilecomponent/Makefile configrpccomponent/Makefile -libicinga/Makefile icinga/Makefile +icinga-app/Makefile jsonrpc/Makefile ]) diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am new file mode 100644 index 000000000..3f5640cc7 --- /dev/null +++ b/icinga-app/Makefile.am @@ -0,0 +1,21 @@ +## Process this file with automake to produce Makefile.in + + +bin_PROGRAMS = \ + icinga + +icinga_SOURCES = \ + icinga.cpp + +icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD + +icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_BUILD -I${top_srcdir}/base \ + -I${top_srcdir}/jsonrpc \ + -I${top_srcdir}/cJSON \ + -I${top_srcdir}/libicinga \ + -I${top_srcdir} + +icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \ + $(top_builddir)/jsonrpc/libjsonrpc.la \ + $(top_builddir)/base/libbase.la \ + ${top_builddir}/cJSON/libcJSON.la diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj new file mode 100644 index 000000000..4d972431c --- /dev/null +++ b/icinga-app/icinga-app.vcxproj @@ -0,0 +1,89 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + {BE412865-FEBA-4259-AD41-58950D1F5432} + Win32Proj + icinga + icinga-app + + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + true + $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath) + $(OutDir);$(LibraryPath) + + + false + $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath) + $(OutDir);$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;I2_ICINGALAUNCHER_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + base.lib;icinga.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + base.lib;icinga.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/icinga/icinga.cpp b/icinga-app/icinga.cpp similarity index 100% rename from icinga/icinga.cpp rename to icinga-app/icinga.cpp diff --git a/icinga.sln b/icinga.sln index 5fd6e76cc..7c89d4477 100644 --- a/icinga.sln +++ b/icinga.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "base\base.vcxproj", "{9C92DA90-FD53-43A9-A244-90F2E8AF9677}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsonrpc", "jsonrpc\jsonrpc.vcxproj", "{8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}" @@ -14,13 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution TODO.txt = TODO.txt EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}" - ProjectSection(ProjectDependencies) = postProject - {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {66BED474-C33F-48F9-90BA-BBCFEDC006B8} - {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} - {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configfilecomponent", "configfilecomponent\configfilecomponent.vcxproj", "{E58F1DA7-B723-412B-B2B7-7FF58E2A944E}" ProjectSection(ProjectDependencies) = postProject {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {66BED474-C33F-48F9-90BA-BBCFEDC006B8} @@ -39,6 +32,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configrpccomponent", "confi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cJSON", "cJSON\cJSON.vcxproj", "{66BED474-C33F-48F9-90BA-BBCFEDC006B8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga", "icinga\icinga.vcxproj", "{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\icinga-app.vcxproj", "{BE412865-FEBA-4259-AD41-58950D1F5432}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -53,10 +50,6 @@ Global {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 - {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}.Release|Win32.ActiveCfg = Release|Win32 - {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32 {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.ActiveCfg = Debug|Win32 {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Debug|Win32.Build.0 = Debug|Win32 {E58F1DA7-B723-412B-B2B7-7FF58E2A944E}.Release|Win32.ActiveCfg = Release|Win32 @@ -69,6 +62,14 @@ Global {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.Build.0 = Debug|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.ActiveCfg = Release|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.Build.0 = Release|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32 + {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}.Release|Win32.ActiveCfg = Release|Win32 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icinga/Makefile.am b/icinga/Makefile.am index 3f5640cc7..f6dc16554 100644 --- a/icinga/Makefile.am +++ b/icinga/Makefile.am @@ -1,21 +1,29 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = \ - icinga +pkglib_LTLIBRARIES = \ + libicinga.la -icinga_SOURCES = \ - icinga.cpp +libicinga_la_SOURCES = \ + endpoint.cpp \ + endpoint.h \ + endpointmanager.cpp \ + endpointmanager.h \ + icingaapplication.cpp \ + icingaapplication.h \ + i2-icinga.h \ + jsonrpcendpoint.cpp \ + jsonrpcendpoint.h \ + virtualendpoint.cpp \ + virtualendpoint.h -icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD +libicinga_la_CFLAGS = -DI2_ICINGA_BUILD -icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_BUILD -I${top_srcdir}/base \ +libicinga_la_CXXFLAGS = -DI2_ICINGA_BUILD -I${top_srcdir}/base \ -I${top_srcdir}/jsonrpc \ -I${top_srcdir}/cJSON \ - -I${top_srcdir}/libicinga \ -I${top_srcdir} -icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \ - $(top_builddir)/jsonrpc/libjsonrpc.la \ +libicinga_la_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \ $(top_builddir)/base/libbase.la \ ${top_builddir}/cJSON/libcJSON.la diff --git a/libicinga/endpoint.cpp b/icinga/endpoint.cpp similarity index 100% rename from libicinga/endpoint.cpp rename to icinga/endpoint.cpp diff --git a/libicinga/endpoint.h b/icinga/endpoint.h similarity index 100% rename from libicinga/endpoint.h rename to icinga/endpoint.h diff --git a/libicinga/endpointmanager.cpp b/icinga/endpointmanager.cpp similarity index 100% rename from libicinga/endpointmanager.cpp rename to icinga/endpointmanager.cpp diff --git a/libicinga/endpointmanager.h b/icinga/endpointmanager.h similarity index 100% rename from libicinga/endpointmanager.h rename to icinga/endpointmanager.h diff --git a/libicinga/i2-icinga.h b/icinga/i2-icinga.h similarity index 100% rename from libicinga/i2-icinga.h rename to icinga/i2-icinga.h diff --git a/libicinga/libicinga.vcxproj b/icinga/icinga.vcxproj similarity index 97% rename from libicinga/libicinga.vcxproj rename to icinga/icinga.vcxproj index f4a0a5a09..5e075a9bd 100644 --- a/libicinga/libicinga.vcxproj +++ b/icinga/icinga.vcxproj @@ -10,6 +10,21 @@ Win32 + + + + + + + + + + + + + + + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} Win32Proj @@ -18,12 +33,12 @@ - Application + DynamicLibrary true MultiByte - Application + DynamicLibrary false true MultiByte @@ -80,21 +95,6 @@ base.lib;jsonrpc.lib;cJSON.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - diff --git a/libicinga/icingaapplication.cpp b/icinga/icingaapplication.cpp similarity index 100% rename from libicinga/icingaapplication.cpp rename to icinga/icingaapplication.cpp diff --git a/libicinga/icingaapplication.h b/icinga/icingaapplication.h similarity index 100% rename from libicinga/icingaapplication.h rename to icinga/icingaapplication.h diff --git a/libicinga/jsonrpcendpoint.cpp b/icinga/jsonrpcendpoint.cpp similarity index 100% rename from libicinga/jsonrpcendpoint.cpp rename to icinga/jsonrpcendpoint.cpp diff --git a/libicinga/jsonrpcendpoint.h b/icinga/jsonrpcendpoint.h similarity index 100% rename from libicinga/jsonrpcendpoint.h rename to icinga/jsonrpcendpoint.h diff --git a/libicinga/virtualendpoint.cpp b/icinga/virtualendpoint.cpp similarity index 100% rename from libicinga/virtualendpoint.cpp rename to icinga/virtualendpoint.cpp diff --git a/libicinga/virtualendpoint.h b/icinga/virtualendpoint.h similarity index 100% rename from libicinga/virtualendpoint.h rename to icinga/virtualendpoint.h diff --git a/libicinga/Makefile.am b/libicinga/Makefile.am deleted file mode 100644 index f6dc16554..000000000 --- a/libicinga/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in - - -pkglib_LTLIBRARIES = \ - libicinga.la - -libicinga_la_SOURCES = \ - endpoint.cpp \ - endpoint.h \ - endpointmanager.cpp \ - endpointmanager.h \ - icingaapplication.cpp \ - icingaapplication.h \ - i2-icinga.h \ - jsonrpcendpoint.cpp \ - jsonrpcendpoint.h \ - virtualendpoint.cpp \ - virtualendpoint.h - -libicinga_la_CFLAGS = -DI2_ICINGA_BUILD - -libicinga_la_CXXFLAGS = -DI2_ICINGA_BUILD -I${top_srcdir}/base \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/cJSON \ - -I${top_srcdir} - -libicinga_la_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \ - $(top_builddir)/base/libbase.la \ - ${top_builddir}/cJSON/libcJSON.la -- 2.40.0