aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-28 23:38:04 +0100
committerJustin Clark-Casey (justincc)2012-03-28 23:38:04 +0100
commit7aa0c05fba34b2347d41d350c9109c1dd43a1965 (patch)
tree96286848f941a8062644fb422546942685951613
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentBulletSim: update 64 bit libraries and change Linux configuration to use the ... (diff)
downloadopensim-SC_OLD-7aa0c05fba34b2347d41d350c9109c1dd43a1965.zip
opensim-SC_OLD-7aa0c05fba34b2347d41d350c9109c1dd43a1965.tar.gz
opensim-SC_OLD-7aa0c05fba34b2347d41d350c9109c1dd43a1965.tar.bz2
opensim-SC_OLD-7aa0c05fba34b2347d41d350c9109c1dd43a1965.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rwxr-xr-xbin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config8
-rwxr-xr-xbin/lib32/BulletSim.dllbin533504 -> 533504 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin619145 -> 2333901 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin686080 -> 686080 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin688866 -> 2528521 bytes
-rwxr-xr-xbin/libBulletSim-x86_64.sobin977886 -> 0 bytes
-rwxr-xr-xbin/libBulletSim.sobin864751 -> 0 bytes
7 files changed, 4 insertions, 4 deletions
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
index 026417a..1bc7e41 100755
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -1,6 +1,6 @@
1<configuration> 1<configuration>
2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" /> 2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" /> 3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
4 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
5 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" /> 5 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
6</configuration> 6</configuration>
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 5bef6e9..2c28063 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 9882f5b..f40f446 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 9f09ef8..d9e5e89 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
Binary files differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index fa47bf1..06770a4 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ
diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so
deleted file mode 100755
index 527eda5..0000000
--- a/bin/libBulletSim-x86_64.so
+++ /dev/null
Binary files differ
diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so
deleted file mode 100755
index 9f91bfd..0000000
--- a/bin/libBulletSim.so
+++ /dev/null
Binary files differ