tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes.

This commit is contained in:
Gunnar Beutner 2012-04-13 11:08:33 +02:00
parent fda4f1189b
commit d5be7a0b4f
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base/application.cpp
View File

@ -190,14 +190,7 @@ Component::Ptr Application::LoadComponent(const string& path, const ConfigObject
#ifdef _WIN32 #ifdef _WIN32
HMODULE hModule = LoadLibrary(path.c_str()); HMODULE hModule = LoadLibrary(path.c_str());
#else /* _WIN32 */ #else /* _WIN32 */
lt_dlhandle hModule = 0; lt_dlhandle hModule = lt_dlopen(path.c_str());
lt_dladvise advise;
if (!lt_dladvise_init(&advise) && !lt_dladvise_global(&advise)) {
hModule = lt_dlopenadvise(path.c_str(), advise);
}
lt_dladvise_destroy(&advise);
#endif /* _WIN32 */ #endif /* _WIN32 */
if (hModule == NULL) if (hModule == NULL)

3
configrpccomponent/Makefile.am
View File

@ -16,4 +16,5 @@ libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \ libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
${top_builddir}/jsonrpc/libjsonrpc.la \ ${top_builddir}/jsonrpc/libjsonrpc.la \
${top_builddir}/cJSON/libcJSON.la ${top_builddir}/cJSON/libcJSON.la \
${top_builddir}/icinga/icinga

4
icinga/icinga.vcxproj
View File

@ -54,7 +54,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -70,7 +70,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>

5
jsonrpc/Makefile.am
View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
noinst_LTLIBRARIES = \ pkglib_LTLIBRARIES = \
libjsonrpc.la libjsonrpc.la
libjsonrpc_la_SOURCES = \ libjsonrpc_la_SOURCES = \
@ -15,6 +15,5 @@ libjsonrpc_la_SOURCES = \
netstring.cpp \ netstring.cpp \
netstring.h netstring.h
libjsonrpc_la_CFLAGS = -DI2_JSONRPC_BUILD
libjsonrpc_la_CXXFLAGS = -DI2_JSONRPC_BUILD -I${top_srcdir}/base \ libjsonrpc_la_CXXFLAGS = -DI2_JSONRPC_BUILD -I${top_srcdir}/base \
-I${top_srcdir}/cJSON -I${top_srcdir}/cJSON