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/.
This commit is contained in:
Jens-Heiner Rechtien 2005-12-28 16:38:35 +00:00
parent 7d1a04d30d
commit da6b7ab2df

View file

@ -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",