aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-25 04:26:32 +0000
committerJustin Clark-Casey (justincc)2012-02-29 22:03:15 +0000
commit38d5e1fab34cb9c4a3cdc37ccba128feb388691b (patch)
tree146632248bae69f9ab0ee9f51f912bf6a8639591
parentRemove some more unused Bullet libraries. (diff)
downloadopensim-SC_OLD-38d5e1fab34cb9c4a3cdc37ccba128feb388691b.zip
opensim-SC_OLD-38d5e1fab34cb9c4a3cdc37ccba128feb388691b.tar.gz
opensim-SC_OLD-38d5e1fab34cb9c4a3cdc37ccba128feb388691b.tar.bz2
opensim-SC_OLD-38d5e1fab34cb9c4a3cdc37ccba128feb388691b.tar.xz
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
-rw-r--r--bin/OpenMetaverse.dll.config10
-rw-r--r--bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so)bin124540 -> 124540 bytes
-rw-r--r--bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so)bin128100 -> 128100 bytes
-rw-r--r--bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so)bin142616 -> 142616 bytes
-rw-r--r--bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib)bin125136 -> 125136 bytes
5 files changed, 5 insertions, 5 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 13fdc11..e8c90a4 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> 5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> 6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
7</configuration> 7</configuration>
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
index 0106b56..0106b56 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
Binary files differ
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
index 53543e7..53543e7 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
Binary files differ
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
index be11bb4..be11bb4 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
+++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
Binary files differ
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
index dc50775..dc50775 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
+++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
Binary files differ