diff options
author | Joachim Lingner <jl@openoffice.org> | 2010-10-21 16:14:09 +0200 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2010-10-21 16:14:09 +0200 |
commit | 06a5ed97b8ccff99b13cee8a101881b10216fba1 (patch) | |
tree | b00f18abe14e9d664515c063617e5b2c081aabfd /jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | |
parent | b2f9f93005e951c747a3a8f40dbd34edc859e213 (diff) |
jl162 #i115180# OOo does not find VM runtime library of Java 1.6.0_22 on Mac
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 352c13c3c..4a607a071 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -73,7 +73,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll" #elif UNX #ifdef MACOSX - "/../../../JavaVM" + "/../../../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 |