configure: always enable gnu_windres if available

Use the appropiate Makefile variable to ensure the resource file is only built into shared libraries instead.

Timo Rothenpieler committed 4 years ago

Commit b77fff41 parent 6ded80a9 files · +10 −10Browse files

Unified · Split

9 files

configure +2 −2
libavcodec/Makefile +1 −1
libavdevice/Makefile +1 −1
libavfilter/Makefile +1 −1
libavformat/Makefile +1 −1
libavutil/Makefile +1 −1
libpostproc/Makefile +1 −1
libswresample/Makefile +1 −1
libswscale/Makefile +1 −1

configure+2−2

@@ -5571,7 +5571,7 @@ case $target_os in · 5570 unmodified lines
5571	5571	# Cannot build both shared and static libs when using dllimport.
5572	5572	disable static
5573	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	5575	enabled x86_32 && check_ldflags -Wl,--large-address-aware
5576	5576	shlibdir_default="$bindir_default"
5577	5577	SLIBPREF=""
@@ -5650,7 +5650,7 @@ case $target_os in · 72 unmodified lines
5650	5650	SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
5651	5651	enabled x86_64 && objformat="win64" \|\| objformat="win32"
5652	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	5654	add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
5655	5655	;;
5656	5656	*-dos\|freedos\|opendos)

libavcodec/Makefile+1−1

@@ -1218,7 +1218,7 @@ OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_fram · 1217 unmodified lines
1218	1218	OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o
1219	1219
1220	1220	# Windows resource file
1221		−SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
	1221	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
1222	1222
1223	1223	SKIPHEADERS += %_tablegen.h \
1224	1224	%_tables.h \

libavdevice/Makefile+1−1

@@ -59,7 +59,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o · 58 unmodified lines
59	59	SHLIBOBJS-$(CONFIG_DECKLINK_INDEV) += reverse.o
60	60
61	61	# Windows resource file
62		−SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
	62	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
63	63
64	64	SKIPHEADERS += decklink_common.h
65	65	SKIPHEADERS-$(CONFIG_DECKLINK) += decklink_enc.h decklink_dec.h \

libavfilter/Makefile+1−1

@@ -605,7 +605,7 @@ OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o · 604 unmodified lines
605	605	SHLIBOBJS += log2_tab.o
606	606
607	607	# Windows resource file
608		−SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o
	608	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o
609	609
610	610	SKIPHEADERS-$(CONFIG_LCMS2) += fflcms2.h
611	611	SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h

libavformat/Makefile+1−1

@@ -714,7 +714,7 @@ SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o · 713 unmodified lines
714	714	OBJS-$(CONFIG_IEC61883_INDEV) += dv.o
715	715
716	716	# Windows resource file
717		−SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o
	717	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o
718	718
719	719	SKIPHEADERS-$(CONFIG_IMF_DEMUXER) += imf.h
720	720	SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h

libavutil/Makefile+1−1

@@ -201,7 +201,7 @@ OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o · 200 unmodified lines
201	201	OBJS += $(COMPAT_OBJS:%=../compat/%)
202	202
203	203	# Windows resource file
204		−SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o
	204	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o
205	205
206	206	SKIPHEADERS += objc.h
207	207	SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h

libpostproc/Makefile+1−1

@@ -10,4 +10,4 @@ OBJS = postprocess.o \ · 9 unmodified lines
10	10	version.o \
11	11
12	12	# Windows resource file
13		−SLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o
	13	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o

libswresample/Makefile+1−1

@@ -22,6 +22,6 @@ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o · 21 unmodified lines
22	22	SHLIBOBJS += log2_tab.o
23	23
24	24	# Windows resource file
25		−SLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o
	25	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o
26	26
27	27	TESTPROGS = swresample

libswscale/Makefile+1−1

@@ -25,7 +25,7 @@ OBJS = alphablend.o \ · 24 unmodified lines
25	25	SHLIBOBJS += log2_tab.o
26	26
27	27	# Windows resource file
28		−SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
	28	+SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
29	29
30	30	TESTPROGS = colorspace \
31	31	floatimg_cmp \