Use the appropiate Makefile variable to ensure the resource file is only built into shared libraries instead.
Unified · Split
| @@ -5571,7 +5571,7 @@ case $target_os in · 5570 unmodified lines | |||
| 5571 | # Cannot build both shared and static libs when using dllimport. | 5571 | # Cannot build both shared and static libs when using dllimport. |
| 5572 | disable static | 5572 | disable static |
| 5573 | fi | 5573 | fi |
| 5574 | enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres | 5574 | ! enabled small && test_cmd $windres --version && enable gnu_windres |
| 5575 | enabled x86_32 && check_ldflags -Wl,--large-address-aware | 5575 | enabled x86_32 && check_ldflags -Wl,--large-address-aware |
| 5576 | shlibdir_default="$bindir_default" | 5576 | shlibdir_default="$bindir_default" |
| 5577 | SLIBPREF="" | 5577 | SLIBPREF="" |
| @@ -5650,7 +5650,7 @@ case $target_os in · 72 unmodified lines | |||
| 5650 | SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' | 5650 | SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' |
| 5651 | enabled x86_64 && objformat="win64" || objformat="win32" | 5651 | enabled x86_64 && objformat="win64" || objformat="win32" |
| 5652 | enable dos_paths | 5652 | enable dos_paths |
| 5653 | enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres | 5653 | ! enabled small && test_cmd $windres --version && enable gnu_windres |
| 5654 | add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 | 5654 | add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 |
| 5655 | ;; | 5655 | ;; |
| 5656 | *-dos|freedos|opendos) | 5656 | *-dos|freedos|opendos) |
| @@ -1218,7 +1218,7 @@ OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_fram · 1217 unmodified lines | |||
| 1218 | OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o | 1218 | OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o |
| 1219 | 1219 | ||
| 1220 | # Windows resource file | 1220 | # Windows resource file |
| 1221 | SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o | 1221 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o |
| 1222 | 1222 | ||
| 1223 | SKIPHEADERS += %_tablegen.h \ | 1223 | SKIPHEADERS += %_tablegen.h \ |
| 1224 | %_tables.h \ | 1224 | %_tables.h \ |
| @@ -59,7 +59,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o · 58 unmodified lines | |||
| 59 | SHLIBOBJS-$(CONFIG_DECKLINK_INDEV) += reverse.o | 59 | SHLIBOBJS-$(CONFIG_DECKLINK_INDEV) += reverse.o |
| 60 | 60 | ||
| 61 | # Windows resource file | 61 | # Windows resource file |
| 62 | SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o | 62 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o |
| 63 | 63 | ||
| 64 | SKIPHEADERS += decklink_common.h | 64 | SKIPHEADERS += decklink_common.h |
| 65 | SKIPHEADERS-$(CONFIG_DECKLINK) += decklink_enc.h decklink_dec.h \ | 65 | SKIPHEADERS-$(CONFIG_DECKLINK) += decklink_enc.h decklink_dec.h \ |
| @@ -605,7 +605,7 @@ OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o · 604 unmodified lines | |||
| 605 | SHLIBOBJS += log2_tab.o | 605 | SHLIBOBJS += log2_tab.o |
| 606 | 606 | ||
| 607 | # Windows resource file | 607 | # Windows resource file |
| 608 | SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o | 608 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o |
| 609 | 609 | ||
| 610 | SKIPHEADERS-$(CONFIG_LCMS2) += fflcms2.h | 610 | SKIPHEADERS-$(CONFIG_LCMS2) += fflcms2.h |
| 611 | SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h | 611 | SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h |
| @@ -714,7 +714,7 @@ SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o · 713 unmodified lines | |||
| 714 | OBJS-$(CONFIG_IEC61883_INDEV) += dv.o | 714 | OBJS-$(CONFIG_IEC61883_INDEV) += dv.o |
| 715 | 715 | ||
| 716 | # Windows resource file | 716 | # Windows resource file |
| 717 | SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o | 717 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o |
| 718 | 718 | ||
| 719 | SKIPHEADERS-$(CONFIG_IMF_DEMUXER) += imf.h | 719 | SKIPHEADERS-$(CONFIG_IMF_DEMUXER) += imf.h |
| 720 | SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h | 720 | SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h |
| @@ -201,7 +201,7 @@ OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o · 200 unmodified lines | |||
| 201 | OBJS += $(COMPAT_OBJS:%=../compat/%) | 201 | OBJS += $(COMPAT_OBJS:%=../compat/%) |
| 202 | 202 | ||
| 203 | # Windows resource file | 203 | # Windows resource file |
| 204 | SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o | 204 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o |
| 205 | 205 | ||
| 206 | SKIPHEADERS += objc.h | 206 | SKIPHEADERS += objc.h |
| 207 | SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h | 207 | SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h |
| @@ -10,4 +10,4 @@ OBJS = postprocess.o \ · 9 unmodified lines | |||
| 10 | version.o \ | 10 | version.o \ |
| 11 | 11 | ||
| 12 | # Windows resource file | 12 | # Windows resource file |
| 13 | SLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o | 13 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o |
| @@ -22,6 +22,6 @@ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o · 21 unmodified lines | |||
| 22 | SHLIBOBJS += log2_tab.o | 22 | SHLIBOBJS += log2_tab.o |
| 23 | 23 | ||
| 24 | # Windows resource file | 24 | # Windows resource file |
| 25 | SLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o | 25 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o |
| 26 | 26 | ||
| 27 | TESTPROGS = swresample | 27 | TESTPROGS = swresample |
| @@ -25,7 +25,7 @@ OBJS = alphablend.o \ · 24 unmodified lines | |||
| 25 | SHLIBOBJS += log2_tab.o | 25 | SHLIBOBJS += log2_tab.o |
| 26 | 26 | ||
| 27 | # Windows resource file | 27 | # Windows resource file |
| 28 | SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o | 28 | SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o |
| 29 | 29 | ||
| 30 | TESTPROGS = colorspace \ | 30 | TESTPROGS = colorspace \ |
| 31 | floatimg_cmp \ | 31 | floatimg_cmp \ |