From e2c560a9f681bc6bf696604cc60029552701f089 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 8 Apr 2008 17:31:25 +0000 Subject: [PATCH] Move decision about whether or not to compile osdep/mmap_os2.c to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26350 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ osdep/Makefile | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index da99423e75..5944c73e0e 100755 --- a/configure +++ b/configure @@ -3054,6 +3054,7 @@ if test "$_mman" = yes ; then _def_mman='#define HAVE_SYS_MMAN_H 1' else _def_mman='#undef HAVE_SYS_MMAN_H' + os2 && _need_mmap=yes fi echores "$_mman" @@ -7732,6 +7733,7 @@ HAVE_POSIX_SELECT = $_posix_select NEED_GETTIMEOFDAY = $_need_gettimeofday NEED_GLOB = $_need_glob +NEED_MMAP = $_need_mmap NEED_SETENV = $_need_setenv NEED_SHMEM = $_need_shmem NEED_STRSEP = $_need_strsep diff --git a/osdep/Makefile b/osdep/Makefile index c0f7a2c7ec..5a7645d713 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -7,6 +7,7 @@ SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c SRCS_COMMON-$(NEED_GETTIMEOFDAY) += gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += glob-win.c +SRCS_COMMON-$(NEED_MMAP) += mmap-os2.c SRCS_COMMON-$(NEED_SETENV) += setenv.c SRCS_COMMON-$(NEED_SHMEM) += shmem.c SRCS_COMMON-$(NEED_STRSEP) += strsep.c @@ -26,9 +27,6 @@ getch = getch2-win.c endif ifeq ($(TARGET_OS),OS/2) getch = getch2-os2.c -ifneq ($(HAVE_SYS_MMAN_H),yes) -SRCS_COMMON += mmap-os2.c -endif endif SRCS_COMMON += $(timer) SRCS_COMMON += $(getch)