diff options
| author | Arto Kitula <arto.kitula@gmail.com> | 2018-08-10 18:50:15 +0300 |
|---|---|---|
| committer | Arto Kitula <arto.kitula@gmail.com> | 2018-08-10 18:50:15 +0300 |
| commit | 92217a81b59a4908811348467906e980ed774a85 (patch) | |
| tree | d079bec4e186979ca43a33a58d13b57691147bc6 /build_files/cmake/platform/platform_apple.cmake | |
| parent | d0e083a60d8223acf77ee3913dd050d0c66f6e53 (diff) | |
update image libraries, D3005 with few mods
Diffstat (limited to 'build_files/cmake/platform/platform_apple.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 93d7220c884..faed0cf25fc 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -159,7 +159,10 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg - ) + ) + # commenting out until libs are updated on svn. schroedinger and orc + # will be removed then + # set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} vpx webp swresample) set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} schroedinger orc vpx webp swresample) set(FFMPEG_LIBPATH ${FFMPEG}/lib) endif() @@ -169,6 +172,8 @@ if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG) set(OPENJPEG ${LIBDIR}/openjpeg) set(WITH_SYSTEM_OPENJPEG ON) set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include) + # same as with ffmpeg libs, update when svn are updated + #set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjpeg.a) endif() |