From daee2eda93c3135964784417f81c5cb4ce52871f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 Feb 2012 04:10:39 +0000
Subject: 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.
---
 OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs |   3 +++
 bin/BulletSim-x86_64.dll                         | Bin 768000 -> 0 bytes
 bin/BulletSim.dll                                | Bin 562176 -> 0 bytes
 bin/lib32/BulletSim.dll                          | Bin 0 -> 562176 bytes
 bin/lib64/BulletSim-x86_64.dll                   | Bin 0 -> 768000 bytes
 5 files changed, 3 insertions(+)
 delete mode 100755 bin/BulletSim-x86_64.dll
 delete mode 100755 bin/BulletSim.dll
 create mode 100755 bin/lib32/BulletSim.dll
 create mode 100755 bin/lib64/BulletSim-x86_64.dll

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
     {
         if (_mScene == null)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("BulletSim.dll");
+
             _mScene = new BSScene(sceneIdentifier);
         }
         return (_mScene);
diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll
deleted file mode 100755
index ec21dfe..0000000
Binary files a/bin/BulletSim-x86_64.dll and /dev/null differ
diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll
deleted file mode 100755
index d1571cf..0000000
Binary files a/bin/BulletSim.dll and /dev/null differ
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
new file mode 100755
index 0000000..d1571cf
Binary files /dev/null and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib64/BulletSim-x86_64.dll b/bin/lib64/BulletSim-x86_64.dll
new file mode 100755
index 0000000..ec21dfe
Binary files /dev/null and b/bin/lib64/BulletSim-x86_64.dll differ
-- 
cgit v1.1