diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-16 17:26:34 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-18 07:15:49 +0100 |
| commit | d8bbae2fd6786c2647b7b59e54d9dabdd47603d7 (patch) | |
| tree | d51d9683d59c320fe8ec6fe64b804927d674b70f /ios/experimental | |
| parent | e20f27f0a04a3c0c0ba38a2b78f5c2591e27bbc0 (diff) | |
Get more --disable-dynamic-loading code out of shlib.cxx.
It's not terribly nice, but, hopefully, better.
The hope is that one day, lo_get_library_map will be no more.
In lo_get_implementation_map we can specify more precisely what to link
into the binary.
Change-Id: I99a1854fbae05be2f70302cc56bea88e522ec129
Diffstat (limited to 'ios/experimental')
| -rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 18cf09f04587..5da9455f96a0 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -18,9 +18,10 @@ extern "C" const lib_to_component_mapping * -lo_get_libmap(void) +lo_get_library_map(void) { static lib_to_component_mapping map[] = { + NON_APP_SPECIFIC_COMPONENT_MAP { "libanalysislo.a", analysis_component_getFactory }, { "libanimcorelo.a", animcore_component_getFactory }, { "libavmedialo.a", avmedia_component_getFactory }, @@ -81,6 +82,18 @@ lo_get_libmap(void) } extern "C" +const lib_to_component_mapping * +lo_get_implementation_map(void) +{ + static lib_to_component_mapping map[] = { + NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP + { NULL, NULL } + }; + + return map; +} + +extern "C" void lo_initialize(void) { |