diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:31:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-05-11 10:31:21 +0000 |
| commit | 650a600e41ab405d8590db35ebbcfb6a537e4baf (patch) | |
| tree | d29a10af645b79434f166b4067e384ced69a88ab /jvmfwk/plugins | |
| parent | 5acd61bc64fadc4075d0c683e44a68f576247b6e (diff) | |
INTEGRATION: CWS linuxppc02 (1.4.2); FILE MERGED
2005/05/03 20:07:50 ericb 1.4.2.1: i38974 good path for libjvm.so Linux PPC
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 4caf351ee96d..75cbc0d6079b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -2,9 +2,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2005-04-27 08:53:19 $ + * last change: $Author: rt $ $Date: 2005-05-11 11:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,14 @@ char const* const* OtherInfo::getRuntimePaths(int * size) #elif UNX #ifdef MACOSX "/../../../JavaVM" +#endif +#if defined(LINUX) && defined(POWERPC) + "/bin/classic/libjvm.so", + "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so" // for Blackdown PPC + "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC + #else + "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" #endif @@ -121,6 +128,9 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib" #else #if defined(LINUX) && defined(POWERPC) + "/bin", + "/jre/bin", + "/bin/classic", "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/native_threads", |