aedi: enable libwebpmux and disable webpmux tool

This commit is contained in:
alexey.lysiuk 2023-08-23 12:45:53 +03:00
parent dbd750017e
commit 848d1079fd
2 changed files with 1 additions and 5 deletions

View file

@ -489,7 +489,7 @@ class WebpTarget(base.CMakeStaticDependencyTarget):
def configure(self, state: BuildState): def configure(self, state: BuildState):
option_suffices = ( option_suffices = (
'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'LIBWEBPMUX', 'VWEBP', 'WEBPINFO', 'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'VWEBP', 'WEBPINFO', 'WEBPMUX',
) )
for suffix in option_suffices: for suffix in option_suffices:
@ -501,7 +501,6 @@ class WebpTarget(base.CMakeStaticDependencyTarget):
super().post_build(state) super().post_build(state)
shutil.copytree(state.install_path / 'share/WebP/cmake', state.install_path / 'lib/cmake/WebP') shutil.copytree(state.install_path / 'share/WebP/cmake', state.install_path / 'lib/cmake/WebP')
self.keep_module_target(state, 'WebP::webp')
class ZlibNgTarget(base.CMakeStaticDependencyTarget): class ZlibNgTarget(base.CMakeStaticDependencyTarget):

3
deps/.gitignore vendored
View file

@ -45,9 +45,6 @@
/sdl2/include/SDL2/SDL_config_*.h /sdl2/include/SDL2/SDL_config_*.h
/sdl2/include/SDL2/SDL_copying.h /sdl2/include/SDL2/SDL_copying.h
/sdl2/include/SDL2/SDL_test*.h /sdl2/include/SDL2/SDL_test*.h
/webp/include/webp/demux.h
/webp/**/libwebpdecoder.*
/webp/**/libwebpdemux.*
!/vulkan-headers/share !/vulkan-headers/share
/vulkan-loader/loader/ /vulkan-loader/loader/