summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-26 18:13:46 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-26 23:08:51 +0200
commitd2d18606f8e1ab95599a8704d0a713464bd366ed (patch)
treef0c8390d510b02700a7fea30d8ad7af389f35952 /jvmfwk
parent54c47b5408769234373aaa78f9916e3453cb1250 (diff)
Add the location of the 64-bit jvm.dll
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 81355dda210c..02f6d0058cf8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -69,7 +69,9 @@ char const* const* SunInfo::getRuntimePaths(int * size)
#if defined(WNT)
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
- "/bin/classic/jvm.dll"
+ "/bin/classic/jvm.dll",
+ // The 64-bit JRE has the jvm in bin/server
+ "/bin/server/jvm.dll"
#elif defined(OS2)
"/bin/classic/jvm.dll",
#elif UNX