Hello,

patch is ok. Please go ahead and apply.

Thanks,
Kai

2017-08-17 14:14 GMT+02:00 Martin Storsjö <mar...@martin.st>:
> Previously, we didn't actually ever include the def file in this library.
>
> Signed-off-by: Martin Storsjö <mar...@martin.st>
> ---
>  mingw-w64-crt/Makefile.am          | 3 +++
>  mingw-w64-crt/lib32/Makefile.am    | 1 -
>  mingw-w64-crt/libarm32/Makefile.am | 1 -
>  3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
> index 1600ac2..b6c0f43 100644
> --- a/mingw-w64-crt/Makefile.am
> +++ b/mingw-w64-crt/Makefile.am
> @@ -491,6 +491,7 @@ lib32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS32) 
> $(sysincludes)
>  lib32_LIBRARIES += lib32/libwindowscodecs.a
>  lib32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
>  lib32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
> +lib32_libwindowscodecs_a_AR = $(DTDEF32) 
> $(top_srcdir)/lib32/windowscodecs.def && $(AR) $(ARFLAGS)
>
>  lib32_LIBRARIES += lib32/libwbemuuid.a
>  lib32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
> @@ -790,6 +791,7 @@ lib64_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS64) 
> $(sysincludes)
>  lib64_LIBRARIES += lib64/libwindowscodecs.a
>  lib64_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
>  lib64_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
> +lib64_libwindowscodecs_a_AR = $(DTDEF64) 
> $(top_srcdir)/lib-common/windowscodecs.def && $(AR) $(ARFLAGS)
>
>  lib64_LIBRARIES += lib64/libwbemuuid.a
>  lib64_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
> @@ -1088,6 +1090,7 @@ libarm32_libwmcodecdspuuid_a_CPPFLAGS = 
> $(CPPFLAGSARM32) $(sysincludes)
>  libarm32_LIBRARIES += libarm32/libwindowscodecs.a
>  libarm32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
>  libarm32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
> +libarm32_libwindowscodecs_a_AR = $(DTDEFARM32) 
> $(top_srcdir)/lib-common/windowscodecs.def && $(AR) $(ARFLAGS)
>
>  libarm32_LIBRARIES += libarm32/libwbemuuid.a
>  libarm32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
> diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
> index f04a5b2..adf4c07 100644
> --- a/mingw-w64-crt/lib32/Makefile.am
> +++ b/mingw-w64-crt/lib32/Makefile.am
> @@ -284,7 +284,6 @@ lib32_DATA += %reldir%/libwevtfwd.a
>  lib32_DATA += %reldir%/libwiadss.a
>  lib32_DATA += %reldir%/libwin32k.a
>  lib32_DATA += %reldir%/libwin32spl.a
> -lib32_DATA += %reldir%/libwindowscodecs.a
>  lib32_DATA += %reldir%/libwinhttp.a
>  lib32_DATA += %reldir%/libwininet.a
>  lib32_DATA += %reldir%/libwinmm.a
> diff --git a/mingw-w64-crt/libarm32/Makefile.am 
> b/mingw-w64-crt/libarm32/Makefile.am
> index aeb9e75..10a4b96 100644
> --- a/mingw-w64-crt/libarm32/Makefile.am
> +++ b/mingw-w64-crt/libarm32/Makefile.am
> @@ -886,7 +886,6 @@ libarm32_DATA += %reldir%/libwimgapi.a
>  libarm32_DATA += %reldir%/libwinbici.a
>  libarm32_DATA += %reldir%/libwinbio.a
>  libarm32_DATA += %reldir%/libwinbrand.a
> -libarm32_DATA += %reldir%/libwindowscodecs.a
>  libarm32_DATA += %reldir%/libwindowscodecsext.a
>  libarm32_DATA += %reldir%/libwindows.data.pdf.a
>  libarm32_DATA += %reldir%/libwindows.globalization.fontgroups.a
> --
> 2.7.4
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to