diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-09-14 19:20:31 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-09-17 20:50:08 +0200 |
| commit | 7369e3012ddde90e987b055302fcc20e40754556 (patch) | |
| tree | 168a869e6f158e07224bd2b3b6a1085f9cdde6ad /external | |
| parent | 9788961cc30e151adcc32044d16899a5406d2c51 (diff) | |
upgrade to libwebp-1.2.4
Change-Id: Iaa3872345abcc2b9042abb32a824ff4b95ec57b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwebp/Makefile.vc.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/external/libwebp/Makefile.vc.patch b/external/libwebp/Makefile.vc.patch index 653998319b82..f13c12410e46 100644 --- a/external/libwebp/Makefile.vc.patch +++ b/external/libwebp/Makefile.vc.patch @@ -25,7 +25,7 @@ +CCDEBUG = $(CC) $(NOLOGO) /Od /Zi /D_DEBUG /RTC1 CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN - LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE + LDFLAGS = /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE @@ -67,7 +67,7 @@ RTLIB = /MD RTLIBD = /MDd @@ -89,7 +89,7 @@ {src}.rc{$(DIROBJ)}.res: $(RC) /fo$@ $< -@@ -461,39 +461,39 @@ +@@ -469,41 +469,41 @@ # File-specific flag builds. Note batch rules take precedence over wildcards, # so for now name each file individually. $(DIROBJ)\examples\anim_diff.obj: examples\anim_diff.c @@ -122,6 +122,9 @@ {imageio}.c{$(DIROBJ)\imageio}.obj:: - $(CC) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $< + $(CC_) $(CFLAGS) /Fd$(DIROBJ)\imageio\ /Fo$(DIROBJ)\imageio\ $< + {sharpyuv}.c{$(DIROBJ)\sharpyuv}.obj:: +- $(CC) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $< ++ $(CC_) $(CFLAGS) /Fd$(DIROBJ)\sharpyuv\ /Fo$(DIROBJ)\sharpyuv\ $< {src\dec}.c{$(DIROBJ)\dec}.obj:: - $(CC) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $< + $(CC_) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$(DIROBJ)\dec\ $< |