changeset 26319:b90151a7dcbb

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

--- a/configure	Tue Apr 08 17:31:25 2008 +0000
+++ b/configure	Tue Apr 08 18:03:14 2008 +0000
@@ -1311,6 +1311,8 @@
 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 @@
 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 @@
   # -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 @@
 
 if os2 ; then
   _exesuf=".exe"
+  _getch=getch2-os2.c
   _need_shmem=no
   _ar="emxomfar -p256"
   _ranlib="echo ignoring ranlib"
@@ -7740,6 +7746,9 @@
 NEED_SWAB    = $_need_swab
 NEED_VSSCANF = $_need_vsscanf
 
+GETCH = $_getch
+TIMER = $_timer
+
 # audio output
 OSS = $_ossaudio
 ALSA = $_alsa

--- a/osdep/Makefile	Tue Apr 08 17:31:25 2008 +0000
+++ b/osdep/Makefile	Tue Apr 08 18:03:14 2008 +0000
@@ -2,6 +2,9 @@
 
 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_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