diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 18:03:14 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 18:03:14 +0000 |
commit | 2abdcd86d9ed98b44cd4531120162c1b099a8008 (patch) | |
tree | 64bad3418343785cf57f460177b770f2e0668052 /osdep | |
parent | e2c560a9f681bc6bf696604cc60029552701f089 (diff) | |
download | mpv-2abdcd86d9ed98b44cd4531120162c1b099a8008.tar.bz2 mpv-2abdcd86d9ed98b44cd4531120162c1b099a8008.tar.xz |
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
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/Makefile | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/osdep/Makefile b/osdep/Makefile index 5a7645d713..ea57977b62 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -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 |