Mercurial > mplayer.hg

changeset 22348:9879c4598744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the decision about stream cache compilation to configure.
author diego
date Tue, 27 Feb 2007 17:13:17 +0000
parents c8a46062a210
children a10f905b29ff
files configure osdep/Makefile
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Feb 27 17:12:23 2007 +0000
+++ b/configure	Tue Feb 27 17:13:17 2007 +0000
@@ -643,6 +643,7 @@
 _rpath=no
 _asmalign_pot=auto
 _color_console=no
+_stream_cache=yes
 for ac_option do
   case "$ac_option" in
   --help|-help|-h)
@@ -1286,6 +1287,10 @@
   _ld_extra="$_ld_extra -lwinmm"
 fi
 
+if mingw32 ; then
+  _stream_cache=no
+fi
+
 # Check how to call 'head' and 'tail'. Newer versions spit out warnings
 # if used as 'head -1' instead of 'head -n 1', but older versions don't
 # know about '-n'.
@@ -7458,7 +7463,7 @@
 FTP = $_ftp
 STREAMING_LIVE555 = $_live
 VSTREAM = $_vstream
-STREAM_CACHE = yes
+STREAM_CACHE = $_stream_cache
 DVBIN = $_dvbin
 VIDIX = $_vidix_internal
 EXTERNAL_VIDIX = $_vidix_external
@@ -7736,7 +7741,7 @@
 
 /* Define this to compile stream-caching support, it can be enabled via
    -cache <kilobytes> */
-#define USE_STREAM_CACHE 1
+$_def_stream_cache
 
 /* Define if you are using XviD library */
 $_def_xvid
--- a/osdep/Makefile	Tue Feb 27 17:12:23 2007 +0000
+++ b/osdep/Makefile	Tue Feb 27 17:13:17 2007 +0000
@@ -5,9 +5,7 @@
 
 SRCS-$(HAVE_SYS_MMAN_H)       += mmap_anon.c
 SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
-ifneq ($(TARGET_OS),MINGW32)
 SRCS-$(STREAM_CACHE)          += shmem.c
-endif
 
 SRCS-$(NEED_FSEEKO)           += fseeko.c
 SRCS-$(NEED_FTELLO)           += ftello.c