Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge

author: Melanie 2011-10-11 22:15:44 +0100
committer: Melanie 2011-10-11 22:15:44 +0100
commit: 071c3fe721ed02d7db4d9ddfbd31f29d287702c4 (patch)
tree: 2bbe6cb3535395043344200e3b07e7df47c632f6 /bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
parent: Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge (diff)
parent: Add back BulletSPlugin.dll.config that I somehow managed to delete today in a... (diff)
download: opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.zip
opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.gz
opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.bz2
opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.xz
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 @@
+<configuration>
+  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
+  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" />
+</configuration>
author	Melanie	2011-10-11 22:15:44 +0100
committer	Melanie	2011-10-11 22:15:44 +0100
commit	071c3fe721ed02d7db4d9ddfbd31f29d287702c4 (patch)
tree	2bbe6cb3535395043344200e3b07e7df47c632f6 /bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
parent	Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge (diff)
parent	Add back BulletSPlugin.dll.config that I somehow managed to delete today in a... (diff)
download	opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.zip opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.gz opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.bz2 opensim-SC_OLD-071c3fe721ed02d7db4d9ddfbd31f29d287702c4.tar.xz

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>