From 4a5f9fe6a20a17917da4a55f043aed5f161ec025 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 25 Feb 2012 04:26:32 +0000
Subject: [PATCH] Move libopenjpeg native libraries into lib32 and lib64 as
 appropriate.

---
 bin/OpenMetaverse.dll.config                        |  10 +++++-----
 .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so     | Bin
 .../libopenjpeg-dotnet-2.1.3.0-dotnet-1.so          | Bin
 .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so   | Bin
 .../libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib       | Bin
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename bin/{ => lib32}/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so (100%)
 rename bin/{ => lib32}/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so (100%)
 rename bin/{ => lib64}/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so (100%)
 rename bin/{ => lib64}/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib (100%)

diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 13fdc11c72..e8c90a4a1d 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
 <configuration>
-    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
-    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
-    <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" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
+    <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" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
 </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
similarity index 100%
rename from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
rename to bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
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
similarity index 100%
rename from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
rename to bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
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
similarity index 100%
rename from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
rename to bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
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
similarity index 100%
rename from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
rename to bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib