diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
| commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
| tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /configure | |
| parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
| parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
| download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz | |
Merge svn changes up to r31004
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1815,7 +1815,9 @@ cat > $TMPC << EOF int main(void) { return 0; } EOF if test "$_runtime_cpudetection" = no ; then - cc_check -march=native && proc=native + if test $cc_vendor != "intel" ; then + cc_check -march=native && proc=native + fi if test "$proc" = "k8"; then cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp fi @@ -1963,7 +1965,9 @@ int main(void) { return 0; } EOF # This is a stripped-down version of the i386 fallback. if test "$_runtime_cpudetection" = no ; then - cc_check -march=native && proc=native + if test $cc_vendor != "intel" ; then + cc_check -march=native && proc=native + fi # --- AMD processors --- if test "$proc" = "k8"; then cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp @@ -8492,7 +8496,6 @@ $def_yasm #define CONFIG_LIBVORBIS 0 #define CONFIG_POWERPC_PERF 0 #define CONFIG_SMALL 0 -#define CONFIG_SWSCALE 1 #define CONFIG_SWSCALE_ALPHA 1 #define HAVE_ATTRIBUTE_PACKED 1 |