for fix old ode for linux and others by using again same unmanaged lib as ubode. Otherwise mono will just use the wrong one, since they have same api, and are both always loaded by mono

This commit is contained in:
UbitUmarov
2022-11-09 01:35:12 +00:00
parent 4ec3fce8f1
commit d0a7a4fd0e
8 changed files with 482 additions and 484 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -66,7 +66,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
return;
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("ode.dll");
Util.LoadArchSpecificWindowsDll("ubode.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).

View File

@@ -1,7 +1,5 @@
<configuration>
<dllmap os="osx" dll="ode" target="lib64/libode.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" />
<dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" />
<dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" />
<dllmap os="osx" dll="ubode" target="lib64/libubode.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ubode" target="lib64/libubode-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="ubode" target="lib32/libubode" />
</configuration>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.