ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2012-02-21 02:52:20 +00:00
parent 90dc5f47e7
commit 68a4ef5ef6
11 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -66,20 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
// controlled in Ode.NET.dll.config
if (Util.IsWindows())
{
string nativeLibraryPath;
if (Util.Is64BitProcess())
nativeLibraryPath = "lib64/ode.dll";
else
nativeLibraryPath = "lib32/ode.dll";
m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
m_log.ErrorFormat(
"[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath);
}
Util.LoadArchSpecificWindowsDll("ode.dll");
// Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
// http://opensimulator.org/mantis/view.php?id=2750).