diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /bin/Physics | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'bin/Physics')
| -rwxr-xr-x | bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config new file mode 100755 index 0000000..026417a --- /dev/null +++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | <configuration> | ||
| 2 | <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" /> | ||
| 3 | <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" /> | ||
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" /> | ||
| 5 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" /> | ||
| 6 | </configuration> | ||