diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:38:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:38:35 +0000 |
| commit | da6b7ab2dfb7fde2de5adc0d0f05cb039f86a8c7 (patch) | |
| tree | ea2e55b9f7d6ce9735af08bac8166439f09f2c7d /jvmfwk | |
| parent | 7d1a04d30d0b1bf65000490d1c236cbf998a1571 (diff) | |
INTEGRATION: CWS pj43 (1.9.6); FILE MERGED
2005/12/03 09:15:20 pjanik 1.9.6.1: #i57424#: Blackdown's AMD64 Java port is using /server/.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index fc29ffb6358e..a776b2e4dda4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -4,9 +4,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2005-10-25 11:35:14 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:38:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,6 +79,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/classic/libjvm.so", // for IBM Java "/jre/bin/classic/libjvm.so", // for IBM Java "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC + "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems #endif @@ -103,6 +104,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/bin/classic", "/jre/bin/classic", "/lib/" JFW_PLUGIN_ARCH "/client", + "/lib/" JFW_PLUGIN_ARCH "/server", "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", |