diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:25:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:26:07 +0200 |
commit | 8740762c43dc92cfefa58769bb8cfade82aa695c (patch) | |
tree | 1550bb212ec5689d8441dc60f3decb0a02e6058d /configure | |
parent | 454c89dde3afd8f84d2631dd87da47bf23de3fe3 (diff) | |
parent | d010e95f86089abe9a3d4d4a66ac8102312d28a4 (diff) | |
download | ffmpeg-8740762c43dc92cfefa58769bb8cfade82aa695c.tar.gz |
Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'
* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
avserver: Remove unused loadable module support
Conflicts:
configure
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -2284,7 +2284,6 @@ enable dxva2 vaapi vdpau # build settings SHFLAGS='-shared -Wl,-soname,$$(@F)' -FFSERVERLDFLAGS=-Wl,-E LIBPREF="lib" LIBSUF=".a" FULLNAME='$(NAME)$(BUILDSUF)' @@ -3412,7 +3411,6 @@ case $target_os in host_libs= ;; sunos) - FFSERVERLDFLAGS="" SHFLAGS='-shared -Wl,-h,$$(@F)' enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" network_extralibs="-lsocket -lnsl" @@ -3460,7 +3458,6 @@ case $target_os in SLIBSUF=".dylib" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' - FFSERVERLDFLAGS=-Wl,-bind_at_load objformat="macho" enabled x86_64 && objformat="macho64" enabled_any pic shared || @@ -3560,7 +3557,6 @@ case $target_os in add_cppflags -D_GNU_SOURCE add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' - FFSERVERLDFLAGS="" LIBSUF="_s.a" SLIBPREF="" SLIBSUF=".dll" @@ -3601,7 +3597,6 @@ case $target_os in ;; osf1) add_cppflags -D_OSF_SOURCE -D_POSIX_PII -D_REENTRANT - FFSERVERLDFLAGS= ;; minix) ;; @@ -4679,7 +4674,6 @@ LD_LIB=$LD_LIB LD_PATH=$LD_PATH DLLTOOL=$dlltool LDFLAGS=$LDFLAGS -LDFLAGS-ffserver=$FFSERVERLDFLAGS SHFLAGS=$(echo $($ldflags_filter $SHFLAGS)) YASMFLAGS=$YASMFLAGS BUILDSUF=$build_suffix |