mantis 9068: replace unmanaged libs for mac by new universal ones, that eacf file does include libs for each cpu type

2024-11-21 14:29:10 -07:00 · 2023-03-21 18:46:26 +00:00 · 2023-03-21 18:46:26 +00:00 · 3ab2ba4f07
commit 3ab2ba4f07
parent 41e74aec35
10 changed files with 3 additions and 5 deletions
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@ -1,8 +1,7 @@
 <configuration>
    <dllmap os="windows" cpu="x86-64" dll="openjpeg-dotnet" target="lib64/openjpeg-dotnet-x86_64.dll" />
    <dllmap os="windows" cpu="x86" dll="openjpeg-dotnet" target="lib32/openjpeg-dotnet.dll" />
-    <dllmap os="osx" cpu="x86,x86-64" dll="openjpeg-dotnet" target="lib64/libopenjpeg-dotnet.dylib" />
-    <dllmap os="osx" cpu="arm64" dll="openjpeg-dotnet" target="lib64/libopenjpeg-dotnet-arm64.dylib" />
+    <dllmap os="osx" dll="openjpeg-dotnet" target="lib64/libopenjpeg-dotnet.dylib" />
    <dllmap os="!windows,osx" cpu="x86-64" dll="openjpeg-dotnet" target="lib64/libopenjpeg-dotnet-x86_64.so" />
    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet" target="lib32/openjpeg-dotnet-x86.so" />
    <dllmap os="!windows,osx" cpu="arm64" dll="openjpeg-dotnet" target="lib64/libopenjpeg-dotnet-arm64.so" />
--- a/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
+++ b/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
@ -1,7 +1,7 @@
 <configuration>
  <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
-  <dllmap os="osx" dll="BulletSim" target="lib64/libBulletSim-2.86.1-20221213-universal.dylib" />
+  <dllmap os="osx" dll="BulletSim" target="lib64/libBulletSim.dylib" />
  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
  <dllmap os="!windows,osx" cpu="x86-64" dll="BulletSim" target="lib64/libBulletSim.so" />
  <dllmap os="!windows,osx" cpu="arm64" dll="BulletSim" target="lib64/libBulletSim-arm64.so" />
--- a/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
+++ b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
@ -1,7 +1,6 @@
 <configuration>
  <dllmap os="windows" cpu="x86-64" dll="ubode" target="lib64/ubode.dll" />
-  <dllmap os="osx" cpu="x86-64" dll="ubode" target="lib64/libubode.dylib" />
-  <dllmap os="osx" cpu="arm64" dll="ubode" target="lib64/libubode-arm64.dylib" />
+  <dllmap os="osx" dll="ubode" target="lib64/libubode.dylib" />
  <dllmap os="!windows,osx" cpu="x86-64" dll="ubode" target="lib64/libubode-x86_64.so" />
  <dllmap os="!windows,osx" cpu="x86" dll="ubode" target="lib32/libubode.so" />
 </configuration>
--- a/bin/lib64/libBulletSim-2.86.1-20221213-universal.dylib
+++ b/bin/lib64/libBulletSim-2.86.1-20221213-universal.dylib
--- a/bin/lib64/libBulletSim.dylib
+++ b/bin/lib64/libBulletSim.dylib
--- a/bin/lib64/libopenjpeg-arm64.dylib
+++ b/bin/lib64/libopenjpeg-arm64.dylib
--- a/bin/lib64/libopenjpeg-dotnet-arm64.dylib
+++ b/bin/lib64/libopenjpeg-dotnet-arm64.dylib
--- a/bin/lib64/libopenjpeg-dotnet.dylib
+++ b/bin/lib64/libopenjpeg-dotnet.dylib
--- a/bin/lib64/libubode-arm64.dylib
+++ b/bin/lib64/libubode-arm64.dylib
--- a/bin/lib64/libubode.dylib
+++ b/bin/lib64/libubode.dylib