diff options
author | Justin Clark-Casey (justincc) | 2012-02-21 04:10:39 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-21 04:10:39 +0000 |
commit | daee2eda93c3135964784417f81c5cb4ce52871f (patch) | |
tree | d2970ff94dfbb01d572f939c6262a5620c74c712 | |
parent | Replace previous windows 64-bit sqlite3.dll with one from http://system.data.... (diff) | |
download | opensim-SC-daee2eda93c3135964784417f81c5cb4ce52871f.zip opensim-SC-daee2eda93c3135964784417f81c5cb4ce52871f.tar.gz opensim-SC-daee2eda93c3135964784417f81c5cb4ce52871f.tar.bz2 opensim-SC-daee2eda93c3135964784417f81c5cb4ce52871f.tar.xz |
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | 3 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll (renamed from bin/BulletSim.dll) | bin | 562176 -> 562176 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim-x86_64.dll (renamed from bin/BulletSim-x86_64.dll) | bin | 768000 -> 768000 bytes |
3 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs index 61be56d..0730824 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | |||
@@ -51,6 +51,9 @@ public class BSPlugin : IPhysicsPlugin | |||
51 | { | 51 | { |
52 | if (_mScene == null) | 52 | if (_mScene == null) |
53 | { | 53 | { |
54 | if (Util.IsWindows()) | ||
55 | Util.LoadArchSpecificWindowsDll("BulletSim.dll"); | ||
56 | |||
54 | _mScene = new BSScene(sceneIdentifier); | 57 | _mScene = new BSScene(sceneIdentifier); |
55 | } | 58 | } |
56 | return (_mScene); | 59 | return (_mScene); |
diff --git a/bin/BulletSim.dll b/bin/lib32/BulletSim.dll index d1571cf..d1571cf 100755 --- a/bin/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/BulletSim-x86_64.dll b/bin/lib64/BulletSim-x86_64.dll index ec21dfe..ec21dfe 100755 --- a/bin/BulletSim-x86_64.dll +++ b/bin/lib64/BulletSim-x86_64.dll | |||
Binary files differ | |||