diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:21:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:21:51 +0000 |
| commit | 3e76d31791b6c0240a9ea3d8e8ed70a96ed12734 (patch) | |
| tree | 993b436a842b9b044b9f1b9c0f51207b31b57b69 /jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | |
| parent | 3f54ee1e5a87f22252efc303a97fe045bd242371 (diff) | |
INTEGRATION: CWS ibmjdk01 (1.6.6); FILE MERGED
2005/08/03 11:03:20 fridrich_strba 1.6.6.1: Issue number: 47836
Submitted by: maxweber
Reviewed by: fridrich_strba
Enable the use of IBM JDK for building OOo and IBM JRE for using OOo
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 6abee1f2d110..f0ead187c21f 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.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2005-05-31 17:06:09 $ + * last change: $Author: rt $ $Date: 2005-08-18 08:21:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,16 +98,13 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" #elif UNX -#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 -#elif defined(MACOSX) +#ifdef MACOSX "/../../../JavaVM" #else - - "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", - "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" + "/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 "/classic/libjvm.so" // for Blackdown PPC #endif #endif @@ -125,19 +122,14 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/../Libraries", "/lib" #else -#if defined(LINUX) && defined(POWERPC) - "/bin", - "/jre/bin", - "/bin/classic", + "/bin", + "/jre/bin", + "/bin/classic", + "/jre/bin/classic", "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH -#else - "/lib/" JFW_PLUGIN_ARCH "/client", - "/lib/" JFW_PLUGIN_ARCH "/native_threads", - "/lib/" JFW_PLUGIN_ARCH -#endif #endif }; |