livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DRTVWR-476] - update openjpeg

meow-7.2.2
Anchor 2019-04-18 13:24:14 -07:00
parent 0295311e75
commit 6a250e9bc7
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -2716,9 +2716,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>8f0d541312c0b7a55a0f6295be42a395</string>
<string>49f2a20ecd50c29a66a162d8bbc5cbe6</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31394/263395/openjpeg-2.3.0.523914-darwin64-523914.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36010/301207/openjpeg-1.5.1.526451-darwin64-526451.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -2752,9 +2752,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>6bb7c289ab7ca9d973f29115c574e54a</string>
<string>7ce7dd714c6899ffc4a7473fd578bee0</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31433/263554/openjpeg-2.3.0.523914-windows-523914.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36015/301223/openjpeg-1.5.1.526451-windows-526451.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -2764,9 +2764,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>891c7e483024f6827d1ed26c91b0b868</string>
<string>f024340804396106687fe7a863d5952f</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31432/263547/openjpeg-2.3.0.523914-windows64-523914.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36012/301214/openjpeg-1.5.1.526451-windows64-526451.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>

2
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -38,7 +38,7 @@ if(WINDOWS)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
openjp2.dll
openjpeg.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll

4
indra/cmake/OpenJPEG.cmake
View File

@ -12,8 +12,8 @@ else (USESYSTEMLIBS)
if(WINDOWS)
# Windows has differently named release and debug openjpeg(d) libs.
set(OPENJPEG_LIBRARIES
debug openjp2d
optimized openjp2)
debug openjpegd
optimized openjpeg)
else(WINDOWS)
set(OPENJPEG_LIBRARIES openjpeg)
endif(WINDOWS)

2
indra/llimagej2coj/llimagej2coj.cpp
View File

@ -28,7 +28,7 @@
#include "llimagej2coj.h"
// this is defined so that we get static linking.
#include "opj_includes.h"
#include "openjpeg.h"
#include "lltimer.h"
//#include "llmemory.h"