diff options
| author | obo <obo@openoffice.org> | 2010-10-28 10:51:46 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-10-28 10:51:46 +0200 |
| commit | 087651450c6aa121ea0f1830e7d8224c79588e41 (patch) | |
| tree | 597d17ed40fb2027937498208a04ae3e53cb4ced /jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | |
| parent | 5c04ffa2a50e3d61cc9beae038e9069713cdefca (diff) | |
| parent | 3352853a9d6779a40a50ce7ecee6d794a6a5075f (diff) | |
CWS-TOOLING: integrate CWS jl162
Notes
split repo tag: ure_ooo/OOO330_m13
split repo tag: ure_ooo/OOO330_m14
split repo tag: ure_ooo/OOO330_m15
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 6dd18ccc9f18..3ae1c0f16b92 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -73,7 +73,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll" #elif UNX #ifdef MACOSX - "/../../../JavaVM" + "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 @@ -95,8 +95,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) #ifdef UNX static char const * ar[] = { #ifdef MACOSX - "/../Libraries", - "/lib" + //mac version does not have a ld library path anymore #else "/bin", "/jre/bin", |