[FFmpeg-devel] [PATCH 1/3] configure: always enable gnu_windres if available

[Andreas Rheinhardt]

Timo Rothenpieler:
> Use the appropiate Makefile variable to ensure it's only built into
> shared libraries instead.
> ---
>  configure              | 4 ++--
>  libavdevice/Makefile   | 2 +-
>  libavfilter/Makefile   | 2 +-
>  libavformat/Makefile   | 2 +-
>  libavutil/Makefile     | 2 +-
>  libpostproc/Makefile   | 2 +-
>  libswresample/Makefile | 2 +-
>  libswscale/Makefile    | 2 +-
>  8 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/configure b/configure
> index cbbb4dd9c8..09fbe66e9b 100755
> --- a/configure
> +++ b/configure
> @@ -5569,7 +5569,7 @@ case $target_os in
>              # Cannot build both shared and static libs when using dllimport.
>              disable static
>          fi
> -        enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
> +        ! enabled small && test_cmd $windres --version && enable gnu_windres
>          enabled x86_32 && check_ldflags -Wl,--large-address-aware
>          shlibdir_default="$bindir_default"
>          SLIBPREF=""
> @@ -5648,7 +5648,7 @@ case $target_os in
>          SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
>          enabled x86_64 && objformat="win64" || objformat="win32"
>          enable dos_paths
> -        enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
> +        ! enabled small && test_cmd $windres --version && enable gnu_windres
>          add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
>          ;;
>      *-dos|freedos|opendos)
> diff --git a/libavdevice/Makefile b/libavdevice/Makefile
> index bbe2f69dcc..8a62822b69 100644
> --- a/libavdevice/Makefile
> +++ b/libavdevice/Makefile
> @@ -59,7 +59,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
>  SHLIBOBJS-$(CONFIG_DECKLINK_INDEV)       += reverse.o
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES)             += avdeviceres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES)            += avdeviceres.o
>  
>  SKIPHEADERS                              += decklink_common.h
>  SKIPHEADERS-$(CONFIG_DECKLINK)           += decklink_enc.h decklink_dec.h \
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index c026f8f809..3187f99a50 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -605,7 +605,7 @@ OBJS-$(CONFIG_MOVIE_FILTER)                  += src_movie.o
>  SHLIBOBJS                                    += log2_tab.o
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES)                 += avfilterres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES)                += avfilterres.o
>  
>  SKIPHEADERS-$(CONFIG_LCMS2)                  += fflcms2.h
>  SKIPHEADERS-$(CONFIG_LIBVIDSTAB)             += vidstabutils.h
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index e420384355..f67a99f839 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -714,7 +714,7 @@ SHLIBOBJS-$(CONFIG_SPDIF_MUXER)          += dca_sample_rate_tab.o
>  OBJS-$(CONFIG_IEC61883_INDEV)            += dv.o
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES)            += avformatres.o
>  
>  SKIPHEADERS-$(CONFIG_IMF_DEMUXER)        += imf.h
>  SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
> diff --git a/libavutil/Makefile b/libavutil/Makefile
> index 9435a0bfb0..3d9c07aea8 100644
> --- a/libavutil/Makefile
> +++ b/libavutil/Makefile
> @@ -201,7 +201,7 @@ OBJS-$(!CONFIG_VULKAN)                  += hwcontext_stub.o
>  OBJS += $(COMPAT_OBJS:%=../compat/%)
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES)            += avutilres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES)           += avutilres.o
>  
>  SKIPHEADERS                            += objc.h
>  SKIPHEADERS-$(HAVE_CUDA_H)             += hwcontext_cuda.h
> diff --git a/libpostproc/Makefile b/libpostproc/Makefile
> index d3f3b27f35..77c2b6b016 100644
> --- a/libpostproc/Makefile
> +++ b/libpostproc/Makefile
> @@ -10,4 +10,4 @@ OBJS = postprocess.o           \
>         version.o               \
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o
> diff --git a/libswresample/Makefile b/libswresample/Makefile
> index dc80027c35..8b9a0fe6f5 100644
> --- a/libswresample/Makefile
> +++ b/libswresample/Makefile
> @@ -22,6 +22,6 @@ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o
>  SHLIBOBJS              += log2_tab.o
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o
>  
>  TESTPROGS = swresample
> diff --git a/libswscale/Makefile b/libswscale/Makefile
> index 8e95f74c6b..4c950e6c43 100644
> --- a/libswscale/Makefile
> +++ b/libswscale/Makefile
> @@ -25,7 +25,7 @@ OBJS = alphablend.o                                     \
>  SHLIBOBJS                    += log2_tab.o
>  
>  # Windows resource file
> -SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
> +SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
>  
>  TESTPROGS = colorspace                                                  \
>              floatimg_cmp                                                \

If the resource files are only for dlls, you can remove SLIBOBJS,
because it is now empty.

- Andreas