From 53cf1528cb02390052f6c9a47e4ebc448f9d85f8 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 17 Mar 2007 19:54:31 +0000 Subject: [PATCH] Do not disable cache on MinGW, just disable shmem compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22705 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 +++-- osdep/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 3a9a7d0911..05c456d672 100755 --- a/configure +++ b/configure @@ -646,6 +646,7 @@ _asmalign_pot=auto _color_console=no _stream_cache=yes _def_stream_cache="#define USE_STREAM_CACHE 1" +_need_shmem=yes for ac_option do case "$ac_option" in --help|-help|-h) @@ -1291,8 +1292,7 @@ if win32 ; then fi if mingw32 ; then - _stream_cache=no - _def_stream_cache="#undef USE_STREAM_CACHE" + _need_shmem=no fi if amigaos ; then @@ -7519,6 +7519,7 @@ NEED_GETTIMEOFDAY = $_need_gettimeofday NEED_GLOB = $_need_glob NEED_SCANDIR = $_need_scandir NEED_SETENV = $_need_setenv +NEED_SHMEM = $_need_shmem NEED_STRLCAT = $_need_strlcat NEED_STRLCPY = $_need_strlcpy NEED_STRSEP = $_need_strsep diff --git a/osdep/Makefile b/osdep/Makefile index 15deca13d9..86c551e2a2 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -4,7 +4,6 @@ LIBNAME_COMMON = libosdep.a SRCS_COMMON-$(HAVE_SYS_MMAN_H) += mmap_anon.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c -SRCS_COMMON-$(STREAM_CACHE) += shmem.c SRCS_COMMON-$(NEED_FSEEKO) += fseeko.c SRCS_COMMON-$(NEED_FTELLO) += ftello.c @@ -12,6 +11,7 @@ SRCS_COMMON-$(NEED_GETTIMEOFDAY) += gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += glob-win.c SRCS_COMMON-$(NEED_SCANDIR) += scandir.c SRCS_COMMON-$(NEED_SETENV) += setenv.c +SRCS_COMMON-$(NEED_SHMEM) += shmem.c SRCS_COMMON-$(NEED_STRLCAT) += strlcat.c SRCS_COMMON-$(NEED_STRLCPY) += strlcpy.c SRCS_COMMON-$(NEED_STRSEP) += strsep.c