mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link cppu statically to gcc3_uno on iOS

Browse Source
This commit is contained in:
Tor Lillqvist
2011-08-21 17:33:43 +03:00
parent c209bef8e5
commit b6a9f3560a
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cppu/inc/uno/environment.h
View File

@@ -375,7 +375,11 @@ void SAL_CALL uno_Environment_enter(uno_Environment * pEnv)
int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
#ifdef IOS
/* We link statically on iOS and have just one kind of environment */
void SAL_CALL gcc3_uno_initEnvironment(uno_Environment *pCppEnv)
SAL_THROW_EXTERN_C();
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

10
cppu/source/uno/lbenv.cxx
View File

@@ -1064,6 +1064,14 @@ static bool loadEnv(OUString const & cLibStem,
uno_Environment * pEnv, uno_Environment * pEnv,
void * /*pContext*/) void * /*pContext*/)
{ {
#ifdef IOS
oslModule hMod;
uno_initEnvironmentFunc fpInit = NULL;
if (cLibStem.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gcc3_uno")) )
fpInit = gcc3_uno_initEnvironment;
osl_getModuleHandle( NULL, &hMod );
#else
// late init with some code from matching uno language binding // late init with some code from matching uno language binding
// will be unloaded by environment // will be unloaded by environment
oslModule hMod = cppu::detail::loadModule( cLibStem ); oslModule hMod = cppu::detail::loadModule( cLibStem );
@@ -1074,6 +1082,8 @@ static bool loadEnv(OUString const & cLibStem,
OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT)); OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT));
uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc) uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc)
::osl_getFunctionSymbol( hMod, aSymbolName.pData ); ::osl_getFunctionSymbol( hMod, aSymbolName.pData );
#endif
if (!fpInit) if (!fpInit)
{ {
::osl_unloadModule( hMod ); ::osl_unloadModule( hMod );

4
cppu/source/uno/loadmodule.cxx
View File

@@ -41,9 +41,6 @@
namespace cppu { namespace detail { namespace cppu { namespace detail {
::oslModule loadModule(rtl::OUString const & name) { ::oslModule loadModule(rtl::OUString const & name) {
#ifdef IOS
return NULL;
#else
rtl::OUStringBuffer b; rtl::OUStringBuffer b;
#if defined SAL_DLLPREFIX #if defined SAL_DLLPREFIX
b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX)); b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX));
@@ -54,7 +51,6 @@ namespace cppu { namespace detail {
reinterpret_cast< oslGenericFunction >(&loadModule), reinterpret_cast< oslGenericFunction >(&loadModule),
b.makeStringAndClear().pData, b.makeStringAndClear().pData,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY); SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY);
#endif
} }
} } } }

4
solenv/inc/libs.mk
View File

@@ -323,8 +323,12 @@ REGLIB+=$(STORELIB)
BOOTSTRAPUNOLIB=$(SOLARLIBDIR)/bootstrap.uno.a BOOTSTRAPUNOLIB=$(SOLARLIBDIR)/bootstrap.uno.a
BOOTSTRAPUNOLIB+=$(SALHELPERLIB) $(REGLIB) $(XMLREADERLIB) BOOTSTRAPUNOLIB+=$(SALHELPERLIB) $(REGLIB) $(XMLREADERLIB)
GCC3UNOLIB=-lgcc3_uno
SALLIB+=-lsal_textenc SALLIB+=-lsal_textenc
CPPULIB+=$(GCC3UNOLIB)
CPPUHELPERLIB+=$(BOOTSTRAPUNOLIB) CPPUHELPERLIB+=$(BOOTSTRAPUNOLIB)
UCBHELPERLIB+=$(SALHELPERLIB) UCBHELPERLIB+=$(SALHELPERLIB)