videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

configure: always enable gnu_windres if available 

Use the appropiate Makefile variable to ensure the resource file is
only built into shared libraries instead.
This commit is contained in:
Timo Rothenpieler 2022-08-07 15:26:06 +02:00
parent 6ded80af92
commit b77fff47d0
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -5571,7 +5571,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=""
@ -5650,7 +5650,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)

2
libavcodec/Makefile
View File

@ -1218,7 +1218,7 @@ OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_fram
OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o
# Windows resource file
SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
SHLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
SKIPHEADERS += %_tablegen.h \
%_tables.h \

2
libavdevice/Makefile
View File

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

2
libavfilter/Makefile
View File

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

2
libavformat/Makefile
View File

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

2
libavutil/Makefile
View File

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

2
libpostproc/Makefile
View File

@ -10,4 +10,4 @@ OBJS = postprocess.o \
version.o \
# Windows resource file
SLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o
SHLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o

2
libswresample/Makefile
View File

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

2
libswscale/Makefile
View File

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