Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2012-03-28 23:38:04 +01:00 · 2012-03-28 23:38:04 +01:00 · 7aa0c05fba
parent 33df0c2efd 4138880464
commit 7aa0c05fba
7 changed files with 4 additions and 4 deletions
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@ -1,6 +1,6 @@
 <configuration>
-  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
+  <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
-  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
+  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
-  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./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="./libBulletSim-x86_64.so" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
 </configuration>
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
--- a/bin/libBulletSim-x86_64.so
+++ b/bin/libBulletSim-x86_64.so
--- a/bin/libBulletSim.so
+++ b/bin/libBulletSim.so