aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Physics
diff options
context:
space:
mode:
authorMelanie2013-04-22 22:28:41 +0200
committerMelanie2013-04-22 22:28:41 +0200
commit671a97ef76f681503b7e2024c6037cb5814e245c (patch)
tree4d88ad2405f84ffbb3c9226f4c1ccff07b323766 /bin/Physics
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.zip
opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.gz
opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.bz2
opensim-SC_OLD-671a97ef76f681503b7e2024c6037cb5814e245c.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'bin/Physics')
-rwxr-xr-xbin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
index 1bc7e41..2763525 100755
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -1,6 +1,8 @@
1<configuration> 1<configuration>
2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" /> 2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" /> 3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
4 <dllmap os="osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.dylib" />
5 <dllmap os="osx" cpu="x86-64,ia64" dll="BulletSim" target="lib32/libBulletSim.dylib" />
4 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" /> 6 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
5 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" /> 7 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
6</configuration> 8</configuration>