diff --git a/makefile.unix b/makefile.unix index 90397cac..854f3342 100644 --- a/makefile.unix +++ b/makefile.unix @@ -3,7 +3,8 @@ # It will not install the libraries system-wide, but just create the 'cwebp' # and 'dwebp' tools in the examples/ directory, along with the static # libraries 'src/libwebp.a', 'src/libwebpdecoder.a', 'src/mux/libwebpmux.a', -# 'src/demux/libwebpdemux.a' and 'extras/libwebpextras.a'. +# 'src/demux/libwebpdemux.a', 'extras/libwebpextras.a' and +# 'sharpyuv/libsharpyuv.a'. # # To build the library and examples, use: # make -f makefile.unix @@ -290,11 +291,12 @@ EXTRA_OBJS = \ extras/quality_estimate.o \ LIBWEBPDECODER_OBJS = $(DEC_OBJS) $(DSP_DEC_OBJS) $(UTILS_DEC_OBJS) -LIBWEBP_OBJS = $(SHARPYUV_OBJS) $(LIBWEBPDECODER_OBJS) $(ENC_OBJS) \ +LIBWEBP_OBJS = $(LIBWEBPDECODER_OBJS) $(ENC_OBJS) \ $(DSP_ENC_OBJS) $(UTILS_ENC_OBJS) LIBWEBPMUX_OBJS = $(MUX_OBJS) LIBWEBPDEMUX_OBJS = $(DEMUX_OBJS) LIBWEBPEXTRA_OBJS = $(EXTRA_OBJS) +LIBSHARPYUV_OBJS = $(SHARPYUV_OBJS) HDRS_INSTALLED = \ src/webp/decode.h \ @@ -304,6 +306,10 @@ HDRS_INSTALLED = \ src/webp/mux_types.h \ src/webp/types.h \ +SHARPYUV_HDRS_INSTALLED = \ + sharpyuv/sharpyuv.h \ + sharpyuv/sharpyuv_csp.h + HDRS = \ src/dec/alphai_dec.h \ src/dec/common_dec.h \ @@ -343,6 +349,7 @@ HDRS = \ src/utils/utils.h \ src/webp/format_constants.h \ $(HDRS_INSTALLED) \ + $(SHARPYUV_HDRS_INSTALLED) \ OUT_LIBS = examples/libexample_util.a OUT_LIBS += imageio/libimageio_util.a @@ -350,6 +357,7 @@ OUT_LIBS += imageio/libimagedec.a OUT_LIBS += imageio/libimageenc.a OUT_LIBS += src/libwebpdecoder.a OUT_LIBS += src/libwebp.a +OUT_LIBS += sharpyuv/libsharpyuv.a EXTRA_LIB = extras/libwebpextras.a OUT_EXAMPLES = examples/cwebp examples/dwebp EXTRA_EXAMPLES = examples/gif2webp examples/vwebp examples/webpmux \ @@ -395,6 +403,7 @@ src/libwebpdecoder.a: $(LIBWEBPDECODER_OBJS) src/libwebp.a: $(LIBWEBP_OBJS) src/mux/libwebpmux.a: $(LIBWEBPMUX_OBJS) src/demux/libwebpdemux.a: $(LIBWEBPDEMUX_OBJS) +sharpyuv/libsharpyuv.a: $(LIBSHARPYUV_OBJS) %.a: $(AR) $(ARFLAGS) $@ $^ @@ -412,6 +421,7 @@ examples/webpinfo: examples/webpinfo.o examples/anim_diff: examples/libanim_util.a examples/libgifdec.a examples/anim_diff: src/demux/libwebpdemux.a examples/libexample_util.a examples/anim_diff: imageio/libimageio_util.a src/libwebp.a +examples/anim_diff: sharpyuv/libsharpyuv.a examples/anim_diff: override EXTRA_LIBS += $(GIF_LIBS) examples/anim_diff: EXTRA_FLAGS += -DWEBP_HAVE_GIF examples/anim_dump: examples/libanim_util.a examples/libgifdec.a @@ -420,12 +430,14 @@ examples/anim_dump: examples/libexample_util.a examples/anim_dump: imageio/libimageio_util.a examples/anim_dump: imageio/libimageenc.a examples/anim_dump: src/libwebp.a +examples/anim_dump: sharpyuv/libsharpyuv.a examples/anim_dump: override EXTRA_LIBS += $(GIF_LIBS) $(DWEBP_LIBS) examples/cwebp: examples/libexample_util.a examples/cwebp: imageio/libimagedec.a examples/cwebp: src/demux/libwebpdemux.a examples/cwebp: imageio/libimageio_util.a examples/cwebp: src/libwebp.a +examples/cwebp: sharpyuv/libsharpyuv.a examples/cwebp: override EXTRA_LIBS += $(CWEBP_LIBS) examples/dwebp: examples/libexample_util.a examples/dwebp: imageio/libimagedec.a @@ -433,13 +445,16 @@ examples/dwebp: src/demux/libwebpdemux.a examples/dwebp: imageio/libimageenc.a examples/dwebp: imageio/libimageio_util.a examples/dwebp: src/libwebp.a +examples/dwebp: sharpyuv/libsharpyuv.a examples/dwebp: override EXTRA_LIBS += $(DWEBP_LIBS) examples/gif2webp: examples/libexample_util.a imageio/libimageio_util.a examples/gif2webp: examples/libgifdec.a src/mux/libwebpmux.a src/libwebp.a +examples/gif2webp: sharpyuv/libsharpyuv.a examples/gif2webp: override EXTRA_LIBS += $(GIF_LIBS) examples/gif2webp: EXTRA_FLAGS += -DWEBP_HAVE_GIF examples/vwebp: examples/libexample_util.a src/demux/libwebpdemux.a examples/vwebp: imageio/libimageio_util.a src/libwebp.a +examples/vwebp: sharpyuv/libsharpyuv.a examples/vwebp: override EXTRA_LIBS += $(GL_LIBS) examples/vwebp: EXTRA_FLAGS += -DWEBP_HAVE_GL examples/webpmux: examples/libexample_util.a imageio/libimageio_util.a @@ -447,7 +462,9 @@ examples/webpmux: src/mux/libwebpmux.a src/libwebpdecoder.a examples/img2webp: examples/libexample_util.a imageio/libimageio_util.a examples/img2webp: imageio/libimagedec.a examples/img2webp: src/demux/libwebpdemux.a -examples/img2webp: src/mux/libwebpmux.a src/libwebp.a +examples/img2webp: src/mux/libwebpmux.a +examples/img2webp: src/libwebp.a +examples/img2webp: sharpyuv/libsharpyuv.a examples/img2webp: override EXTRA_LIBS += $(CWEBP_LIBS) examples/webpinfo: examples/libexample_util.a imageio/libimageio_util.a examples/webpinfo: src/libwebpdecoder.a @@ -457,16 +474,19 @@ extras/get_disto: imageio/libimagedec.a extras/get_disto: src/demux/libwebpdemux.a extras/get_disto: imageio/libimageio_util.a extras/get_disto: src/libwebp.a +extras/get_disto: sharpyuv/libsharpyuv.a extras/get_disto: override EXTRA_LIBS += $(CWEBP_LIBS) extras/webp_quality: extras/webp_quality.o extras/webp_quality: imageio/libimageio_util.a extras/webp_quality: $(EXTRA_LIB) src/libwebp.a +extras/webp_quality: sharpyuv/libsharpyuv.a extras/vwebp_sdl: extras/vwebp_sdl.o extras/vwebp_sdl: extras/webp_to_sdl.o extras/vwebp_sdl: imageio/libimageio_util.a extras/vwebp_sdl: src/libwebp.a +extras/vwebp_sdl: sharpyuv/libsharpyuv.a extras/vwebp_sdl: EXTRA_FLAGS += -DWEBP_HAVE_SDL $(SDL_FLAGS) extras/vwebp_sdl: override EXTRA_LIBS += $(SDL_LIBS) @@ -477,12 +497,15 @@ dist: DESTDIR := dist dist: OUT_EXAMPLES += $(EXTRA_EXAMPLES) dist: all $(INSTALL) -m755 -d $(DESTDIR)/include/webp \ - $(DESTDIR)/bin $(DESTDIR)/doc $(DESTDIR)/lib + $(DESTDIR)/include/webp/sharpyuv \ + $(DESTDIR)/bin $(DESTDIR)/doc $(DESTDIR)/lib $(INSTALL) -m755 -s $(OUT_EXAMPLES) $(DESTDIR)/bin $(INSTALL) -m644 $(HDRS_INSTALLED) $(DESTDIR)/include/webp + $(INSTALL) -m644 $(SHARPYUV_HDRS_INSTALLED) $(DESTDIR)/include/webp/sharpyuv $(INSTALL) -m644 src/libwebp.a $(DESTDIR)/lib $(INSTALL) -m644 src/demux/libwebpdemux.a $(DESTDIR)/lib $(INSTALL) -m644 src/mux/libwebpmux.a $(DESTDIR)/lib + $(INSTALL) -m644 sharpyuv/libsharpyuv.a $(DESTDIR)/lib umask 022; \ for m in man/[cdv]webp.1 man/gif2webp.1 man/webpmux.1 \ man/img2webp.1 man/webpinfo.1; do \ diff --git a/tests/fuzzer/makefile.unix b/tests/fuzzer/makefile.unix index e2425639..4a9bff35 100644 --- a/tests/fuzzer/makefile.unix +++ b/tests/fuzzer/makefile.unix @@ -9,6 +9,7 @@ CXXFLAGS = $(CFLAGS) LDFLAGS = -fsanitize=fuzzer LDLIBS = ../../src/mux/libwebpmux.a ../../src/demux/libwebpdemux.a LDLIBS += ../../src/libwebp.a ../../imageio/libimageio_util.a +LDLIBS += ../../sharpyuv/libsharpyuv.a FUZZERS = advanced_api_fuzzer animation_api_fuzzer animencoder_fuzzer FUZZERS += animdecoder_fuzzer mux_demux_api_fuzzer enc_dec_fuzzer