Commit c918191e authored by mru's avatar mru

simplify test for memalign emulation requirement


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7262 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e3b61557
...@@ -707,6 +707,7 @@ bktr="yes" ...@@ -707,6 +707,7 @@ bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
make="gmake" make="gmake"
need_memalign="no"
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
GNU/kFreeBSD) GNU/kFreeBSD)
...@@ -734,6 +735,7 @@ video4linux="no" ...@@ -734,6 +735,7 @@ video4linux="no"
video4linux2="no" video4linux2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
need_memalign="no"
SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)" SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(shlibdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@' VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(shlibdir)/vhook/$@'
extralibs="" extralibs=""
...@@ -1167,6 +1169,8 @@ if test $mmx = "default"; then ...@@ -1167,6 +1169,8 @@ if test $mmx = "default"; then
fi fi
fi fi
test -z "$need_memalign" && need_memalign="$mmx"
#Darwin CC versions #Darwin CC versions
needmdynamicnopic="no" needmdynamicnopic="no"
if test $targetos = Darwin; then if test $targetos = Darwin; then
...@@ -1415,9 +1419,8 @@ fi ...@@ -1415,9 +1419,8 @@ fi
check_header malloc.h check_header malloc.h
check_func memalign check_func memalign
if test "$memalign" = "no" -a "$mmx" = "yes" -a \ if test "$memalign" = "no" -a "$need_memalign" = "yes" -a \
"$memalign_hack" != "yes" -a "$targetos" != "Darwin" -a \ "$memalign_hack" != "yes"; then
"$targetos" != "FreeBSD" ; then
die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack." die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment