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

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

[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                                                \
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] fftools: add DPI awareness manifest

[Timo Rothenpieler]

Some filters, like gdigrab, rely on this to be set to see and report
proper dimensions.
---
 fftools/Makefile         | 3 +++
 fftools/fftools.manifest | 9 +++++++++
 fftools/fftoolsres.rc    | 2 ++
 3 files changed, 14 insertions(+)
 create mode 100644 fftools/fftools.manifest
 create mode 100644 fftools/fftoolsres.rc

diff --git a/fftools/Makefile b/fftools/Makefile
index 6285e6eacb..0348ac9cf1 100644
--- a/fftools/Makefile
+++ b/fftools/Makefile
@@ -20,6 +20,9 @@ OBJS-ffmpeg +=                  \
 
 define DOFFTOOL
 OBJS-$(1) += fftools/cmdutils.o fftools/opt_common.o fftools/$(1).o $(OBJS-$(1)-yes)
+ifdef HAVE_GNU_WINDRES
+OBJS-$(1) += fftools/fftoolsres.o
+endif
 $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
 $$(OBJS-$(1)): | fftools
 $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))
diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest
new file mode 100644
index 0000000000..f2708ecb13
--- /dev/null
+++ b/fftools/fftools.manifest
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/fftools/fftoolsres.rc b/fftools/fftoolsres.rc
new file mode 100644
index 0000000000..0b8b7c86cb
--- /dev/null
+++ b/fftools/fftoolsres.rc
@@ -0,0 +1,2 @@
+#include <windows.h>
+1 RT_MANIFEST fftools.manifest
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] compat: add msvc windres wrapper

[Timo Rothenpieler]

This is by no means a complete wrapper. It's only designed to fit the
usecase ffmpegs build system has.
---
 compat/windows/mswindres | 32 ++++++++++++++++++++++++++++++++
 configure                |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100755 compat/windows/mswindres

diff --git a/compat/windows/mswindres b/compat/windows/mswindres
new file mode 100755
index 0000000000..450525a33e
--- /dev/null
+++ b/compat/windows/mswindres
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+if [ "$1" = "--version" ]; then
+    rc.exe /?
+    exit $?
+fi
+
+if [ $# -lt 2 ]; then
+    echo "Usage: mswindres [-I/include/path ...] [-DSOME_DEFINE ...] [-o output.o] input.rc [output.o]" >&2
+    exit 0
+fi
+
+EXTRA_OPTS="/nologo"
+
+while [ $# -gt 2 ]; do
+    case $1 in
+    -D*) EXTRA_OPTS="$EXTRA_OPTS /d$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;;
+    -I*) EXTRA_OPTS="$EXTRA_OPTS /i$(echo $1 | sed -e "s/^..//" -e "s/ /\\\\ /g")" ;;
+    -o)  OPT_OUT="$2"; shift ;;
+    esac
+    shift
+done
+
+IN="$1"
+if [ -z "$OPT_OUT" ]; then
+    OUT="$2"
+else
+    OUT="$OPT_OUT"
+fi
+
+eval set -- $EXTRA_OPTS
+rc.exe "$@" /fo "$OUT" "$IN"
diff --git a/configure b/configure
index 09fbe66e9b..6761d0cb32 100755
--- a/configure
+++ b/configure
@@ -4369,6 +4369,7 @@ case "$toolchain" in
             die "Unsupported MSVC version (2013 or newer required)"
         fi
         ld_default="$source_path/compat/windows/mslink"
+        windres_default="$source_path/compat/windows/mswindres"
         nm_default="dumpbin.exe -symbols"
         ar_default="lib.exe"
         case "${arch:-$arch_default}" in
@@ -5619,6 +5620,7 @@ case $target_os in
             # Cannot build both shared and static libs with MSVC or icl.
             disable static
         fi
+        ! enabled small && test_cmd $windres --version && enable gnu_windres
         enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
         shlibdir_default="$bindir_default"
         SLIBPREF=""
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [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 +-

You forgot libavcodec.

>  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                                                \

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Timo Rothenpieler]

On 07.08.2022 17:51, Andreas Rheinhardt wrote:
> 
> If the resource files are only for dlls, you can remove SLIBOBJS,
> because it is now empty.
> 

I wasn't sure what those 3 variables are for, compared to the other OBJS 
variables.

In any case I'd be inclined to leave it in, just in case it turns out 
useful again in the future.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Timo Rothenpieler]

On 07.08.2022 18:04, Andreas Rheinhardt wrote:
> 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 +-
> 
> You forgot libavcodec.

Fixed locally
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Timo Rothenpieler]

I'd like to push this series within the week or so.
Some additional review, specially on the POSIX-Shell-Script, would be 
highly appreciated.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".