diff options
| author | wm4 <wm4@nowhere> | 2013-06-16 22:07:48 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-16 22:07:48 +0200 |
| commit | d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6 (patch) | |
| tree | 0d50b238c1a798db9ef09838800c99653c06e408 /configure | |
| parent | 4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (diff) | |
| parent | f794444309a826478fefa00bf13d660793066b81 (diff) | |
| download | mpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.bz2 mpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.xz | |
Merge branch 'cache_new'
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -493,9 +493,7 @@ libavdevice=auto _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" -def_stream_cache="#define CONFIG_STREAM_CACHE 1" def_priority="#undef CONFIG_PRIORITY" -def_pthread_cache="#undef PTHREAD_CACHE" need_shmem=yes _build_man=auto for ac_option do @@ -1453,13 +1451,11 @@ else fi echores "$_pthreads" -if cygwin ; then - if test "$_pthreads" = yes ; then - def_pthread_cache="#define PTHREAD_CACHE 1" - else - _stream_cache=no - def_stream_cache="#undef CONFIG_STREAM_CACHE" - fi +_stream_cache="$_pthreads" +if test "$_stream_cache" = yes ; then + def_stream_cache='#define CONFIG_STREAM_CACHE' +else + def_stream_cache='#undef CONFIG_STREAM_CACHE' fi echocheck "rpath" @@ -3239,7 +3235,6 @@ $def_priority /* configurable options */ $def_stream_cache -$def_pthread_cache /* CPU stuff */ |