Kaydet (Commit) 9a031cf7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Adapt for HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE

Change-Id: I598efffda7be77171cdff9d3d5b8705972cfba18
üst e939dfb3
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <config_features.h>
#include "sal/config.h" #include "sal/config.h"
#include <cassert> #include <cassert>
...@@ -69,6 +71,18 @@ rtl::OUString cppu::getUnoIniUri() { ...@@ -69,6 +71,18 @@ rtl::OUString cppu::getUnoIniUri() {
rtl::OUString uri("file:///assets/program"); rtl::OUString uri("file:///assets/program");
#else #else
rtl::OUString uri(get_this_libpath()); rtl::OUString uri(get_this_libpath());
#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
// We keep both the LO and URE dylibs direcly in the Frameworks
// folder and rc files in Resources. Except for unorc, of which
// there are two, the "LO" one (which is in Resources) and the
// "URE" one which is in Resources/ure. As this code goes into the
// cppuhelper library which is part of URE, we are looking for the
// latter one here. I think...
if (uri.endsWith( "/Frameworks" ) )
{
uri = uri.copy( 0, uri.getLength() - (sizeof("Frameworks")-1) ) + "Resources/ure";
}
#endif
#endif #endif
return uri + "/" SAL_CONFIGFILE("uno"); return uri + "/" SAL_CONFIGFILE("uno");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment