diff options
| author | Justin Clark-Casey (justincc) | 2013-04-09 22:45:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-04-09 22:45:00 +0100 |
| commit | aab2b032aa1ca5a82e3b8daf6f2f82fb5fe61adf (patch) | |
| tree | 4e03579f384ccaa079794e888fc82e4bc24faa1d /bin/Physics | |
| parent | If OpenSimulator is writing a PID file and finds the file already present on ... (diff) | |
| parent | BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim (diff) | |
| download | opensim-SC-aab2b032aa1ca5a82e3b8daf6f2f82fb5fe61adf.zip opensim-SC-aab2b032aa1ca5a82e3b8daf6f2f82fb5fe61adf.tar.gz opensim-SC-aab2b032aa1ca5a82e3b8daf6f2f82fb5fe61adf.tar.bz2 opensim-SC-aab2b032aa1ca5a82e3b8daf6f2f82fb5fe61adf.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/Physics')
| -rwxr-xr-x | bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 2 |
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> |