[MPlayer-cvslog] r22705 - in trunk: configure osdep/Makefile

[diego]

Author: diego
Date: Sat Mar 17 20:54:31 2007
New Revision: 22705

Modified:
   trunk/configure
   trunk/osdep/Makefile

Log:
Do not disable cache on MinGW, just disable shmem compilation.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Mar 17 20:54:31 2007
@@ -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_gettimeofd
 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

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Sat Mar 17 20:54:31 2007
@@ -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)     += 
 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