summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure9
-rw-r--r--osdep/Makefile2
2 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index 92b327acad..7092559c9c 100755
--- a/configure
+++ b/configure
@@ -643,6 +643,7 @@ _ass=auto
_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 @@ if win32 ; then
_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 @@ MPLAYER_NETWORK = $_network
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 @@ $_def_stddef
/* 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
diff --git a/osdep/Makefile b/osdep/Makefile
index fac04133d1..4f1351e531 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -5,9 +5,7 @@ LIBNAME = libosdep.a
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