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

OpenJPEG 2 for macOS.

master
Tonya Souther 2020-10-26 01:09:54 -05:00
parent 105a9958d7
commit 5e4f8c1185
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
autobuild.xml
View File

@ -2936,9 +2936,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>5abf2d9c0b250821c59cc60cd94fd8af</string>
<string>53966a7ba6342395acb7ce15bc3fbe0a</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54840/510064/openjpeg-1.5.1.538970-darwin64-538970.tar.bz2</string>
<string>http://3p.firestormviewer.org/openjpeg-2.3.1.203000304-darwin-203000304.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -4210,7 +4210,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>name</key>
<string>ReleaseFS</string>
</map>
</map>
<key>ReleaseFS_open</key>
<map>
<key>build</key>
<map>
<key>options</key>
<array>
<string>--platform darwin</string>
</array>
</map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>--platform darwin</string>
</array>
</map>
<key>name</key>
<string>ReleaseFS_open</string>
</map>
</map>
<key>name</key>
<string>darwin64</string>
</map>

6
indra/cmake/OpenJPEG.cmake
View File

@ -9,11 +9,7 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(openjpeg)
if(DARWIN)
set(OPENJPEG_LIBRARIES openjpeg)
else(DARWIN)
set(OPENJPEG_LIBRARIES openjp2)
endif(DARWIN)
set(OPENJPEG_LIBRARIES openjp2)
set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg)
endif (USESYSTEMLIBS)

2
indra/llimagej2coj/llimagej2coj.cpp
View File

@ -29,11 +29,9 @@
// this is defined so that we get static linking.
#include "openjpeg.h"
#ifndef LL_DARWIN
#include "cio.h"
#include "event.h"
#define OPENJPEG2
#endif
#include "lltimer.h"