Move decision about which getch2 and timer file to compile to configure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26351 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-08 18:03:14 +00:00
parent e2c560a9f6
commit 2abdcd86d9
2 changed files with 12 additions and 17 deletions

9
configure vendored
View File

@ -1311,6 +1311,8 @@ if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then
fi
_timer=timer-linux.c
_getch=getch2.c
if freebsd ; then
_ld_extra="$_ld_extra -L/usr/local/lib"
_inc_extra="$_inc_extra -I/usr/local/include"
@ -1324,6 +1326,7 @@ fi
if darwin; then
_ld_extra="$_ld_extra -L/usr/local/lib"
_inc_extra="$_inc_extra -I/usr/local/include"
_timer=timer-darwin.c
fi
if aix ; then
@ -1341,11 +1344,13 @@ if win32 ; then
# -lwinmm is always needed for osdep/timer-win2.c
_ld_extra="$_ld_extra -lwinmm"
_confwin32='TARGET_WIN32 = yes'
_timer=timer-win2.c
else
_confwin32='TARGET_WIN32 = no'
fi
if mingw32 ; then
_getch=getch2-win.c
_need_shmem=no
fi
@ -1366,6 +1371,7 @@ fi
if os2 ; then
_exesuf=".exe"
_getch=getch2-os2.c
_need_shmem=no
_ar="emxomfar -p256"
_ranlib="echo ignoring ranlib"
@ -7740,6 +7746,9 @@ NEED_STRSEP = $_need_strsep
NEED_SWAB = $_need_swab
NEED_VSSCANF = $_need_vsscanf
GETCH = $_getch
TIMER = $_timer
# audio output
OSS = $_ossaudio
ALSA = $_alsa

View File

@ -2,6 +2,9 @@ include ../config.mak
LIBNAME_COMMON = libosdep.a
SRCS_COMMON += $(GETCH)
SRCS_COMMON += $(TIMER)
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += mmap_anon.c
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
@ -14,23 +17,6 @@ SRCS_COMMON-$(NEED_STRSEP) += strsep.c
SRCS_COMMON-$(NEED_SWAB) += swab.c
SRCS_COMMON-$(NEED_VSSCANF) += vsscanf.c
getch = getch2.c
timer = timer-linux.c
ifeq ($(TARGET_WIN32),yes)
timer = timer-win2.c
endif
ifeq ($(TARGET_OS),Darwin)
timer = timer-darwin.c
endif
ifeq ($(TARGET_OS),MINGW32)
getch = getch2-win.c
endif
ifeq ($(TARGET_OS),OS/2)
getch = getch2-os2.c
endif
SRCS_COMMON += $(timer)
SRCS_COMMON += $(getch)
include ../mpcommon.mak
mplayer-rc.o: mplayer.rc