RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-14 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

configure: simplify some OS-specific flag setting

Browse Source 
Originally committed as revision 24060 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-05 17:31:18 +00:00
parent 0fca8d24ee
commit 355d81df72
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -2114,7 +2114,7 @@ case $target_os in
enable malloc_aligned enable malloc_aligned
;; ;;
bsd/os) bsd/os)
osextralibs="-lpoll -lgnugetopt" add_extralibs -lpoll -lgnugetopt
strip="strip -d" strip="strip -d"
;; ;;
darwin) darwin)
@ -2123,7 +2123,7 @@ case $target_os in
enabled ppc && add_asflags -force_cpusubtype_ALL enabled ppc && add_asflags -force_cpusubtype_ALL
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress' SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
strip="${strip} -x" strip="${strip} -x"
FFLDFLAGS="-Wl,-dynamic,-search_paths_first" add_ldflags -Wl,-dynamic,-search_paths_first
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
@ -2199,7 +2199,7 @@ case $target_os in
os/2*) os/2*)
strip="lxlite" strip="lxlite"
ln_s="cp -f" ln_s="cp -f"
FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap" add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
LIBSUF="_s.a" LIBSUF="_s.a"
@ -2234,11 +2234,6 @@ check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PI
set_default $PATHS_LIST set_default $PATHS_LIST
add_extralibs $osextralibs
# Combine FFLDFLAGS and the LDFLAGS environment variable.
LDFLAGS="$FFLDFLAGS $LDFLAGS"
# we need to build at least one lib type # we need to build at least one lib type
if ! enabled_any static shared; then if ! enabled_any static shared; then
cat <<EOF cat <<EOF