Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / platform / platform_apple.cmake
index 2cb9e07add9421a06f6e33eaf40f88e49451ff28..047b1fa3b5b9212633e4db52bd17184f3a3a6726 100644 (file)
@@ -161,7 +161,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()
@@ -171,6 +174,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()