mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
update libomv with new dllmapconfiguration helper. This will read again files *dll.config to setup dllmaps, but does need to be called by hand on respective assemblies. It will also set dllmaps for windows. Change ubode to use it. (cross fingers)
This commit is contained in:
@@ -7,6 +7,7 @@ using Mono.Addins;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Region.PhysicsModule.ubOde
|
||||
{
|
||||
@@ -55,8 +56,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
|
||||
//throw new Exception("Invalid physics meshing option");
|
||||
}
|
||||
|
||||
if (Util.IsWindows())
|
||||
Util.LoadArchSpecificWindowsDll("ubode.dll");
|
||||
DllmapConfigHelper.RegisterAssembly(typeof(ubOdeModule).Assembly);
|
||||
|
||||
UBOdeNative.InitODE();
|
||||
|
||||
|
||||
@@ -733,9 +733,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (DllNotFoundException)
|
||||
catch (DllNotFoundException e)
|
||||
{
|
||||
m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed. Often times this is because of an old version of GLIBC. You must have version 2.4 or above!");
|
||||
m_log.Error($"[PHYSICS]: OpenJpeg problem: {e.Message}");
|
||||
return false;
|
||||
}
|
||||
catch (IndexOutOfRangeException)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,9 @@
|
||||
<configuration>
|
||||
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib" />
|
||||
<dllmap os="osx" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
|
||||
<dllmap os="!windows,osx" cpu="armv8" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64" />
|
||||
<dllmap os="!windows,osx" cpu="armv8" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64" />
|
||||
<dllmap os="windows" cpu="x86-64" dll="openjpeg-dotnet" target="openjpeg-dotnet-x86_64.dll" />
|
||||
<dllmap os="windows" cpu="x86" dll="openjpeg-dotnet" target="openjpeg-dotnet.dll" />
|
||||
<dllmap os="osx" cpu="x86,x86-64" dll="openjpeg-dotnet" target="openjpeg-dotnet.dylib" />
|
||||
<dllmap os="osx" cpu="arm64" dll="openjpeg-dotnet" target="openjpeg-dotnet-arm64.dylib" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64" dll="openjpeg-dotnet" target="openjpeg-dotnet-x86_64.so" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet" target="openjpeg-dotnet-x86.so" />
|
||||
<dllmap os="!windows,osx" cpu="arm64" dll="openjpeg-dotnet" target="openjpeg-dotnet-arm64.so" />
|
||||
</configuration>
|
||||
|
||||
Binary file not shown.
@@ -1,5 +1,6 @@
|
||||
<configuration>
|
||||
<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" cpu="x86-64" dll="ubode" target="lib64/ubode.dll" />
|
||||
<dllmap os="osx" cpu="x86,x86-64" dll="ubode" target="lib64/libubode.dylib" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64" 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.
BIN
bin/libubode.so
BIN
bin/libubode.so
Binary file not shown.
0
bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64.so → bin/openjpeg-dotnet-arm64.so
Executable file → Normal file
0
bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-aarch64.so → bin/openjpeg-dotnet-arm64.so
Executable file → Normal file
BIN
bin/ubode.dll
BIN
bin/ubode.dll
Binary file not shown.
Reference in New Issue
Block a user