Update webp to v1.0.0

This commit is contained in:
David Capello 2018-06-09 14:58:00 -03:00
parent 850bf76bf5
commit bd66661d88
3 changed files with 4 additions and 11 deletions

View File

@ -237,7 +237,7 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
# libwebp
if(WITH_WEBP_SUPPORT)
set(WEBP_LIBRARIES webp)
set(WEBP_LIBRARIES webp webpdemux webpmux)
set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
include_directories(${WEBP_INCLUDE_DIR})
endif()

View File

@ -33,15 +33,8 @@ if(NOT USE_SHARED_GIFLIB)
endif()
if(WITH_WEBP_SUPPORT)
set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
set(WEBP_BUILD_DWEBP OFF CACHE BOOL "Build the dwebp command line tool.")
set(WEBP_BUILD_GIF2WEBP OFF CACHE BOOL "Build the gif2webp conversion tool.")
set(WEBP_BUILD_IMG2WEBP OFF CACHE BOOL "Build the img2webp animation tool.")
set(WEBP_BUILD_VWEBP OFF CACHE BOOL "Build the vwebp viewer tool.")
set(WEBP_BUILD_WEBPINFO OFF CACHE BOOL "Build the webpinfo command line tool.")
set(WEBP_BUILD_WEBPMUX OFF CACHE BOOL "Build the webpmux command line tool.")
set(WEBP_BUILD_WEBP_JS OFF CACHE BOOL "Emscripten build of webp.js.")
# Enable img2webp so "webpmux" library is built
set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
add_subdirectory(libwebp)
endif()

2
third_party/libwebp vendored

@ -1 +1 @@
Subproject commit c56a02d9712fd4dddfe43dad4778f4bcce38de15
Subproject commit 698b8844e38a0c5ca50bb20f866e71291bfc3b36