mirror of https://github.com/opensim/opensim.git
change bullet to use dllmap
This commit is contained in:
parent
6e8029d351
commit
a133a0c7ac
|
@ -143,15 +143,8 @@ namespace OpenSim.Region.PhysicsModule.BulletS
|
||||||
|
|
||||||
public BSAPIUnman(string paramName, BSScene physScene)
|
public BSAPIUnman(string paramName, BSScene physScene)
|
||||||
{
|
{
|
||||||
|
DllmapConfigHelper.RegisterAssembly(typeof(BSAPIUnman).Assembly);
|
||||||
PhysicsScene = physScene;
|
PhysicsScene = physScene;
|
||||||
|
|
||||||
// Do something fancy with the paramName to get the right DLL implementation
|
|
||||||
// like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc.
|
|
||||||
if (Util.IsWindows())
|
|
||||||
Util.LoadArchSpecificWindowsDll("BulletSim.dll");
|
|
||||||
// If not Windows, loading is performed by the
|
|
||||||
// Mono loader as specified in
|
|
||||||
// "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialization and simulation
|
// Initialization and simulation
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
<dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
|
<dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
|
||||||
<dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
|
<dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
|
||||||
<dllmap os="osx" cpu="x86" dll="BulletSim" target="lib64/libBulletSim.dylib" />
|
<dllmap os="osx" cpu="x86" dll="BulletSim" target="lib64/libBulletSim.dylib" />
|
||||||
<dllmap os="osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.dylib" />
|
<dllmap os="osx" cpu="x86-64" dll="BulletSim" target="lib64/libBulletSim.dylib" />
|
||||||
<dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
|
<dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
|
||||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
|
<dllmap os="!windows,osx" cpu="x86-64" dll="BulletSim" target="lib64/libBulletSim.so" />
|
||||||
<dllmap os="!windows,osx" cpu="armv8" dll="BulletSim" target="lib64/libBulletSim-aarch64.so" />
|
<dllmap os="!windows,osx" cpu="arm64" dll="BulletSim" target="lib64/libBulletSim-aarch64.so" />
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1611,6 +1611,7 @@
|
||||||
</Configuration>
|
</Configuration>
|
||||||
|
|
||||||
<ReferencePath>../../../../bin/</ReferencePath>
|
<ReferencePath>../../../../bin/</ReferencePath>
|
||||||
|
<Reference name="OpenMetaverse" path="../../../../bin/"/>
|
||||||
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
|
||||||
<Reference name="Nini" path="../../../../bin/"/>
|
<Reference name="Nini" path="../../../../bin/"/>
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
|
Loading…
Reference in New Issue