diff options
author | Justin Clark-Casey (justincc) | 2012-02-25 03:25:56 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-29 22:02:50 +0000 |
commit | e8f2d814e7fb4699fd17287ff772ce272e8c88cc (patch) | |
tree | 9272ac4ee96bd582098765e36a917a635554c53b | |
parent | Merge branch 'master' into 0.7.3-post-fixes (diff) | |
download | opensim-SC_OLD-e8f2d814e7fb4699fd17287ff772ce272e8c88cc.zip opensim-SC_OLD-e8f2d814e7fb4699fd17287ff772ce272e8c88cc.tar.gz opensim-SC_OLD-e8f2d814e7fb4699fd17287ff772ce272e8c88cc.tar.bz2 opensim-SC_OLD-e8f2d814e7fb4699fd17287ff772ce272e8c88cc.tar.xz |
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
-rw-r--r-- | bin/Mono.Data.Sqlite.dll.config | 6 | ||||
-rw-r--r-- | bin/Ode.NET.dll.config | 12 | ||||
-rw-r--r-- | bin/lib32/libode.so (renamed from bin/libode.so) | bin | 3051566 -> 3051566 bytes | |||
-rw-r--r-- | bin/lib32/libsqlite3.txt (renamed from bin/libsqlite3.txt) | 0 | ||||
-rwxr-xr-x | bin/lib32/libsqlite3_32.so (renamed from bin/libsqlite3_32.so) | bin | 635852 -> 635852 bytes | |||
-rw-r--r-- | bin/lib64/libode-x86_64.so (renamed from bin/libode-x86_64.so) | bin | 5546089 -> 5546089 bytes | |||
-rw-r--r-- | bin/lib64/libode.dylib (renamed from bin/libode.dylib) | bin | 2916380 -> 2916380 bytes | |||
-rwxr-xr-x | bin/lib64/libsqlite3.dylib (renamed from bin/libsqlite3.dylib) | bin | 2175300 -> 2175300 bytes | |||
-rwxr-xr-x | bin/lib64/libsqlite3_64.so (renamed from bin/libsqlite3_64.so) | bin | 783200 -> 783200 bytes |
9 files changed, 9 insertions, 9 deletions
diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config index ccc0cf5..e66d1b7 100644 --- a/bin/Mono.Data.Sqlite.dll.config +++ b/bin/Mono.Data.Sqlite.dll.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <configuration> | 1 | <configuration> |
2 | <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" /> | 2 | <dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" /> |
3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" /> |
4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" /> | 4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" /> |
5 | </configuration> | 5 | </configuration> |
diff --git a/bin/Ode.NET.dll.config b/bin/Ode.NET.dll.config index f8f071e..c72c281 100644 --- a/bin/Ode.NET.dll.config +++ b/bin/Ode.NET.dll.config | |||
@@ -1,7 +1,7 @@ | |||
1 | <configuration> | 1 | <configuration> |
2 | <dllmap os="osx" dll="ode" target="libode.dylib" /> | 2 | <dllmap os="osx" dll="ode" target="lib64/libode.dylib" /> |
3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" /> |
4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" /> | 4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" /> |
5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" /> | 5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" /> |
6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" /> | 6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" /> |
7 | </configuration> \ No newline at end of file | 7 | </configuration> |
diff --git a/bin/libode.so b/bin/lib32/libode.so index 6bb85fb..6bb85fb 100644 --- a/bin/libode.so +++ b/bin/lib32/libode.so | |||
Binary files differ | |||
diff --git a/bin/libsqlite3.txt b/bin/lib32/libsqlite3.txt index 8ef66bd..8ef66bd 100644 --- a/bin/libsqlite3.txt +++ b/bin/lib32/libsqlite3.txt | |||
diff --git a/bin/libsqlite3_32.so b/bin/lib32/libsqlite3_32.so index 171ffcd..171ffcd 100755 --- a/bin/libsqlite3_32.so +++ b/bin/lib32/libsqlite3_32.so | |||
Binary files differ | |||
diff --git a/bin/libode-x86_64.so b/bin/lib64/libode-x86_64.so index 9c3070a..9c3070a 100644 --- a/bin/libode-x86_64.so +++ b/bin/lib64/libode-x86_64.so | |||
Binary files differ | |||
diff --git a/bin/libode.dylib b/bin/lib64/libode.dylib index 958d202..958d202 100644 --- a/bin/libode.dylib +++ b/bin/lib64/libode.dylib | |||
Binary files differ | |||
diff --git a/bin/libsqlite3.dylib b/bin/lib64/libsqlite3.dylib index 94dcca8..94dcca8 100755 --- a/bin/libsqlite3.dylib +++ b/bin/lib64/libsqlite3.dylib | |||
Binary files differ | |||
diff --git a/bin/libsqlite3_64.so b/bin/lib64/libsqlite3_64.so index 2646a9c..2646a9c 100755 --- a/bin/libsqlite3_64.so +++ b/bin/lib64/libsqlite3_64.so | |||
Binary files differ | |||