diff options
| author | justincc | 2012-09-18 23:45:06 +0100 |
|---|---|---|
| committer | justincc | 2012-09-18 23:45:06 +0100 |
| commit | 95809cabd947dcbbc69526fec2ad05a10458ddd3 (patch) | |
| tree | 35ac32c186f1ef1fd35dce90bc5ea3b567f921e4 /bin/OpenMetaverse.dll.config | |
| parent | Cleanup from prev. commit (diff) | |
| download | opensim-SC-95809cabd947dcbbc69526fec2ad05a10458ddd3.zip opensim-SC-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.gz opensim-SC-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.bz2 opensim-SC-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.xz | |
Update libopenmetaverse components to commit f5cecaa
Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator
This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5.
DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs.
libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
| -rw-r--r-- | bin/OpenMetaverse.dll.config | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index e8c90a4..b67da5f 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> | 2 | <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" /> |
| 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" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-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" /> | 4 | <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> |
| 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="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> | ||
| 7 | </configuration> | 5 | </configuration> |